son_jay 0.1.0.alpha → 0.1.1.alpha

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjdiYTdiZjkxOWE3ZDg0ZjkxNzY0ZjNkYzEwYzg1ZWM1ZWQ3NTM5Yg==
+    ZTA4ZWUzZGQwNzA1NTE4NzgxOTc3YmM3NzlkZGNhOTY4Yzc1MzljMA==
   data.tar.gz: !binary |-
-    MjA4ZmQ1NDRkZDgwN2JmZDU1YmU4ZmFmMDM0NzhkZjAyZjczMzBiOQ==
+    OWE2NThlMjk0YzNlZDBmNGNmYjVhNGQ2MWE0OGQ4MWEwZDRmYTZlMw==
 SHA512:
   metadata.gz: !binary |-
-    ZDkzNGQ4ZTk1ZjZhNjYyYTg0MDU0NzMwNTM2ZTM0MzJhNWQwNmY1OGIyMDY0
-    YjY2NThhMDJhNmMwODc2NjYyNGM4NDg5NzM3OTllZmJhMjVlMzdhMmMzY2Qw
-    ZjU5YzcwNTY3MTdhMWY1NTI0NDU2NGJiMGZkODZiMmVkOWVkYzk=
+    NTBiNTBkZWNhOWI1ODk1OGJhNTQ2ODlhOGQwZGRlYzhiNGE0YmZhN2QyMzBi
+    MTY4ZWI1MTJlODU5ZmZhYzYzMDRhMGI5ZDI2Mjg5OGQ2Y2IwMDk0MDRhYTgw
+    NmUyZTZhOTAzMmExMTJjNGJhMDFkM2ExNGI5OTc5OGE0YWIxMjI=
   data.tar.gz: !binary |-
-    ZjI0N2FiMTE0MWNiYjVjM2IwZDQ2MGZkN2Y5MWUzNjg2NmVjYWRkZDQzMjU5
-    M2FlMzdjMzM3NmVmZWQxZWVlNzJkM2M1N2VmZGE5OTlhOTBmNzg2ZDI5MmJl
-    MjZmMjdmNTBmNGRiZDNjYTMwZWQ2YjRlZDUxZDFkMDkyNWQ0YzM=
+    NGVmMmM4ZmFiNWUxOWJjNjZjMGRlZTc2OTcwOTJkMmIxYWI1MzJiMzI0NmQ1
+    NWQyODViNDYyNDgyZWZlODdjY2VmZjE3MzI1MjEzMThiNzMyMzgzYzBhNDJi
+    NjFkZjNmN2FmNWEwYmQ0MjNhYWYwOWY5ZTJhNjUxZGJjNzU2Zjk=

data/lib/son_jay/acts_as_model.rb

@@ -0,0 +1,27 @@
+module SonJay
+  module ActsAsModel
+
+    def self.included(other)
+      other.extend ClassBehavior
+    end
+
+    module ClassBehavior
+
+      def json_create(json)
+        data = JSON.parse( json )
+        instance = new
+        instance.sonj_content.load_data data
+        instance
+      end
+
+      def array_class
+        @array_class ||= begin
+          klass = SonJay::ModelArray(self)
+          const_set :Array, klass
+        end
+      end
+
+    end
+
+  end
+end

data/lib/son_jay/model_array.rb

@@ -9,18 +9,12 @@ module SonJay
   end
 
   class ModelArray
+    include ActsAsModel
     extend Forwardable
 
     class << self
       attr_accessor :entry_class
-
-      def array_class
-        #TODO: Factor out duplication w/ ObjectModel::array_class
-        @array_class ||= begin
-          klass = SonJay::ModelArray(self)
-          const_set :Array, klass
-        end
-      end
+      private :entry_class=
     end
 
     def initialize

data/lib/son_jay/object_model/properties_definer.rb

@@ -0,0 +1,16 @@
+module SonJay
+  class ObjectModel
+    class PropertiesDefiner
+
+      def initialize(property_definitions)
+        @property_definitions = property_definitions
+      end
+
+      def property(name, options={})
+        name = "#{name}"
+        @property_definitions << PropertyDefinition.new( name, options[:model] )
+      end
+
+    end
+  end
+end

data/lib/son_jay/object_model.rb

@@ -1,59 +1,55 @@
+require 'set'
 require 'son_jay/object_model/properties'
 require 'son_jay/object_model/property_definition'
+require 'son_jay/object_model/properties_definer'
 
 module SonJay
   class ObjectModel
-
-    class PropertiesDefiner
-
-      def initialize(property_definitions)
-        @property_definitions = property_definitions
-      end
-
-      def property(name, options={})
-        name = "#{name}"
-        @property_definitions << PropertyDefinition.new( name, options[:model] )
-      end
-
-    end
+    include ActsAsModel
 
     class << self
 
-      def json_create(json)
-        data = JSON.parse( json )
-        instance = new
-        instance.sonj_content.load_data data
-        instance
-      end
-
       def properties(&property_initializations)
         @property_initializations = property_initializations
       end
 
       def property_definitions
-        @property_definitions ||= begin
-          definitions = []
-
-          definer = PropertiesDefiner.new(definitions)
-          definer.instance_eval &@property_initializations
-          definitions.each do |d|
-            name = d.name
-            class_eval <<-CODE
-              def #{name}         ; sonj_content[#{name.inspect}]         ; end
-              def #{name}=(value) ; sonj_content[#{name.inspect}] = value ; end
-            CODE
-          end
-          definitions
+        @property_definitions ||= nil
+        return @property_definitions if @property_definitions
+
+        definitions = []
+
+        definer = PropertiesDefiner.new(definitions)
+        definer.instance_eval &@property_initializations
+        @property_definitions = definitions
+
+        validate_model_dependencies!
+
+        definitions.each do |d|
+          name = d.name
+          class_eval <<-CODE
+            def #{name}         ; sonj_content[#{name.inspect}]         ; end
+            def #{name}=(value) ; sonj_content[#{name.inspect}] = value ; end
+          CODE
         end
+
+        @property_definitions
       end
 
-      def array_class
-        @array_class ||= begin
-          klass = SonJay::ModelArray(self)
-          const_set :Array, klass
+      private
+
+      def validate_model_dependencies!(dependants=Set.new)
+        raise InfiniteRegressError if dependants.include?(self)
+        dependants << self
+        hard_model_dependencies.each do |d|
+          next unless d.respond_to?(:validate_model_dependencies!, true)
+          d.send :validate_model_dependencies!, dependants
         end
       end
 
+      def hard_model_dependencies
+        property_definitions.map(&:model_class).compact.uniq
+      end
     end
 
     attr_reader :sonj_content

data/lib/son_jay/value_array.rb

@@ -1,17 +1,12 @@
 module SonJay
   class ValueArray < ::Array
-    Array = SonJay::ModelArray(self)
-
-    def self.array_class
-      self::Array
-    end
+    include ActsAsModel
 
     def sonj_content
       self
     end
 
-    def load_data(data)
-      replace data
-    end
+    alias load_data replace
+
   end
 end

data/lib/son_jay/version.rb

@@ -1,3 +1,3 @@
 module SonJay
-  VERSION = "0.1.0.alpha"
+  VERSION = "0.1.1.alpha"
 end

data/lib/son_jay.rb

@@ -1,8 +1,10 @@
 require 'json'
 require 'son_jay/version'
+require 'son_jay/acts_as_model'
 require 'son_jay/object_model'
 require 'son_jay/model_array'
 require 'son_jay/value_array'
 
 module SonJay
+  class InfiniteRegressError < StandardError ; end
 end

data/spec/acts_as_model_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe SonJay::ActsAsModel do
+  context "included as a class mixin" do
+
+    let( :klass ) {
+      Class.new do
+        include SonJay::ActsAsModel
+
+        class Content
+          attr_reader :loaded_data
+
+          def load_data(data)
+            @loaded_data = data
+          end
+        end
+
+        def sonj_content
+          @sonj_content ||= Content.new
+        end
+      end
+    }
+
+    describe '::json_create' do
+      it "returns a new instance with parsed JSON data loaded into its #sonj_content object" do
+        instance = klass.json_create( '{"hello": "world"}' )
+        loaded_data = instance.sonj_content.loaded_data
+        expect( loaded_data ).to eq( {'hello' => 'world'} )
+      end
+    end
+
+    describe '::array_class' do
+      it "returns an array model class with the target as its entry class" do
+        result = klass.array_class
+        expect( result.entry_class ).to eq( klass )
+      end
+    end
+
+  end
+end

data/spec/model_array_spec.rb

@@ -31,7 +31,6 @@ describe SonJay::ModelArray do
     describe '::array_class' do
       it "returns a model-array subclass for entries of this model-array type (nested array)" do
         array_class = subclass.array_class
-        puts array_class.ancestors
         expect( array_class.ancestors ).to include( SonJay::ModelArray )
         expect( array_class.entry_class ).to eq( subclass )
       end

data/spec/object_model_spec.rb

@@ -133,4 +133,47 @@ describe SonJay::ObjectModel do
 
   end
 
+  describe "a subclass with a directly self-referential property specification" do
+    let!( :subclass ) {
+      cc = lambda{ component }
+      Class.new(described_class) do
+        properties do ; property :component, model: cc.call ; end
+      end
+    }
+
+    let!( :component ) {
+      cc = lambda{ sub_component }
+      Class.new(described_class) do
+        properties do ; property :component, model: cc.call ; end
+      end
+    }
+
+    let!( :sub_component ) {
+      cc = lambda{ subclass }
+      Class.new(described_class) do
+        properties do ; property :component, model: cc.call ; end
+      end
+    }
+
+    it "raises an infinte regress error when property_definitions are resolved" do
+      expect{ subclass.property_definitions }.to raise_exception( SonJay::InfiniteRegressError )
+    end
+  end
+
+  describe "a subclass with an indirectly self-referential property specification" do
+    let!( :subclass ) {
+      Class.new(described_class) do
+        this_model_class = self
+        properties do
+          property :a
+          property :b, model: this_model_class
+        end
+      end
+    }
+
+    it "raises an infinte regress error when property_definitions are resolved" do
+      expect{ subclass.property_definitions }.to raise_exception( SonJay::InfiniteRegressError )
+    end
+  end
+
 end

data/spec/value_array_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe SonJay::ValueArray do
+  it "is array-like" do
+    expect( subject.to_ary ).to eq( subject )
+    expect( subject << 1 << 2 ).to eq( [1, 2] )
+  end
 
   describe '#sonj_content' do
     it "returns the instance itself" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: son_jay
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.1.1.alpha
 platform: ruby
 authors:
 - Steve Jorgensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,13 +88,16 @@ files:
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
 - lib/son_jay.rb
+- lib/son_jay/acts_as_model.rb
 - lib/son_jay/model_array.rb
 - lib/son_jay/object_model.rb
 - lib/son_jay/object_model/properties.rb
+- lib/son_jay/object_model/properties_definer.rb
 - lib/son_jay/object_model/property_definition.rb
 - lib/son_jay/value_array.rb
 - lib/son_jay/version.rb
 - son_jay.gemspec
+- spec/acts_as_model_spec.rb
 - spec/model_array_spec.rb
 - spec/object_model/properties_spec.rb
 - spec/object_model/property_definition_spec.rb
@@ -133,6 +136,7 @@ test_files:
 - features/step_definitions/json_serialization_steps.rb
 - features/step_definitions/model_steps.rb
 - features/support/env.rb
+- spec/acts_as_model_spec.rb
 - spec/model_array_spec.rb
 - spec/object_model/properties_spec.rb
 - spec/object_model/property_definition_spec.rb