parsed 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a31b648e579f02f5a67e76ff13c50c320a41684e
-  data.tar.gz: c08072c995a863fcca5798d7582ebe2f0f7ae8b8
+  metadata.gz: 8f46c0b0e188e6d67cb47daf58082dfc8092dcd3
+  data.tar.gz: 91d380704374bdc1b80b9af8eecf4745bda53632
 SHA512:
-  metadata.gz: 438a84a1c8c5b334c21d40863ca1d530cb1e86ba687a24964f94891c7ca952222c0272dcbeadf210b5cf10e55787596674cbcd166884b4fd01c459ef80468bb6
-  data.tar.gz: 6c52e884a17a830ab855cd468a1884635442f0b373adcd798925e86d99d31acb9f2da6a8829f21ee7bf67487327c2ce7fdbfd6a1ef7e66f805a90586eaf61a1b
+  metadata.gz: ffe99125da545612439ca787d9f70a319a809a53d46b4001cf4258948b3ea03ced0f9c20821ebbeb4334427738b404370000f64b8d634d816f4ab25442312787
+  data.tar.gz: 916b138ae60c6acb784d367c8cc37fdd067dd6138ea08c3924453f2c8c132a1f3d98c847af4ca583989d2b271874b25d648de5529ec5ed7904c2a062d7be1975

data/lib/parsed/parseable.rb

@@ -1,39 +1,26 @@
 require 'json'
 require 'active_support/inflector'
+require_relative 'parses_json'
 
 module Parsed
 
   module Parseable
 
-    # Callback invoked whenever the receiver is included in another module or
-    # class. This should be used in preference to Module.append_features if your
-    # code wants to perform some action when a module is included in another.
-
     def self.included(base)
-
-      # Sets the instance variable names by symbol to object, thereby
-      # frustrating the efforts of the class's author to attempt to provide
-      # proper encapsulation. The variable did not have to exist prior to this
-      # call. If the instance variable name is passed as a string, that string
-      # is converted to a symbol.
-
-      base.instance_variable_set("@parseable_fields",      [])
-      base.instance_variable_set("@parseable_collections", [])
-      base.instance_variable_set("@parseable_json",        {})
-
-      # Adds to obj the instance methods from each module given as a parameter.
-
+      base.instance_variable_set(:@parseable_fields, [])
+      base.instance_variable_set(:@collection_class_cache, {})
       base.extend ClassMethods
     end
 
     module ClassMethods
 
-      attr_accessor :parseable_json,
+      attr_accessor :parseable_hash,
                     :parseable_fields,
-                    :parseable_collections
+                    :parser
 
-      def parse(data)
-        @parseable_json = JSON.parse(data, { :symbolize_names => true })
+      def parse(data, parser = ParsesJson)
+        @parser = parser
+        @parseable_hash = parser.parse(data)
 
         instance = new
         parse_fields(instance)
@@ -70,24 +57,30 @@ module Parsed
       def parse_field(field)
         clazz = determine_collection_class(field)
         if clazz
-          elements = parseable_json[field.to_sym] || []
+          elements = parser.parse_elements(parseable_hash, field)
 
           elements.map do |element|
             if element.instance_of? Hash
-              clazz.parse(element.to_json)
+              clazz.parse(element)
             else
               element
             end
           end
+
         else
-          parseable_json[field.to_sym]
+          parser.parse_value(parseable_hash, field)
         end
       end
 
       def determine_collection_class(field)
-        field.to_s.singularize.camelize.constantize
+        if @collection_class_cache.has_key? field
+          @collection_class_cache[field]
+        else
+          @collection_class_cache[field] =
+            field.to_s.singularize.camelize.constantize
+        end
       rescue NameError => e
-        nil
+        @collection_class_cache[field] = nil
       end
     end
   end

data/lib/parsed/parses_json.rb

@@ -0,0 +1,22 @@
+require 'json'
+
+module Parsed
+  class ParsesJson < Struct.new(:data)
+
+    def self.parse(data)
+      return data if data.instance_of? Hash
+
+      JSON.parse(data, { :symbolize_names => true })
+    end
+
+    def self.parse_value(data, field)
+      data[field.to_sym]
+    end
+
+    def self.parse_elements(data, field)
+      data[field.to_sym] || []
+    end
+
+  end
+
+end

data/lib/parsed/version.rb

@@ -1,3 +1,3 @@
 module Parsed
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parsed
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,6 +84,7 @@ files:
 - Rakefile
 - lib/parsed.rb
 - lib/parsed/parseable.rb
+- lib/parsed/parses_json.rb
 - lib/parsed/version.rb
 - parsed.gemspec
 - spec/parsing_regular_classes_spec.rb