logical_model 0.5.11 → 0.5.12

data/Gemfile

@@ -8,6 +8,7 @@ gem "ethon", "0.4.2"
 gem "kaminari", '~> 0.13.0'
 
 group :development, :test do
+  gem 'debugger'
   gem 'rake'
   gem 'activerecord'
   gem "shoulda"

data/Gemfile.lock

@@ -25,6 +25,13 @@ GEM
       multi_json (~> 1.0)
     arel (2.2.1)
     builder (3.0.0)
+    columnize (0.8.9)
+    debugger (1.6.6)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.2)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.2)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     ethon (0.4.2)
@@ -112,6 +119,7 @@ DEPENDENCIES
   activerecord
   activesupport
   bundler (>= 1.2.2)
+  debugger
   ethon (= 0.4.2)
   gemcutter
   guard-rspec

data/VERSION

@@ -1 +1 @@
-0.5.11
+0.5.12

data/lib/logical_model/associations/has_many_keys.rb

@@ -1,3 +1,5 @@
+require 'string_helper'
+
 class LogicalModel
   module Associations
     module HasManyKeys
@@ -36,9 +38,9 @@ class LogicalModel
 
         def get_attr_class(key, options)
           if options[:class]
-            options[:class].is_a?(String) ? options[:class].constantize : options[:class]
+            options[:class].is_a?(String) ? StringHelper.constantize(options[:class]) : options[:class]
           else
-            key.to_s.singularize.camelize.constantize
+            StringHelper.to_class(key)
           end
         end
 
@@ -55,25 +57,25 @@ class LogicalModel
           end
 
           # Setter
-          # this method loads the contact attributes recieved by logical model from the service
+          # this method loads the associations attributes recieved by logical model from the service
+          # it also allows loading instanciated objects
           define_method "#{association}=" do |params|
             collection = []
             params.each do |attr_params|
-              if attr_params["_type"].present?
-                attr_class = attr_params.delete("_type").to_s.constantize
+              if attr_params.is_a?(attr_class)
+                # in this case we recieved instanciated objects
+                collection << attr_params
+              else
+                # in this case we recieved object attributes, we instanciate here
+                collection << attr_class.new(attr_params)
               end
-              collection << attr_class.new(attr_params)
             end
             instance_variable_set("@#{association}", collection)
           end
 
           # Initialize instance of associated object
-          define_method "new_#{association.to_s.singularize}" do |attr_params|
-            if attr_params["_type"].present?
-              clazz = attr_params.delete(:_type).constantize
-            else
-              clazz = attr_class
-            end
+          define_method "new_#{StringHelper.singularize(association.to_s)}" do |attr_params|
+            clazz = attr_class
 
             return unless clazz
 
@@ -87,9 +89,6 @@ class LogicalModel
             array = []
             key_attributes.each do |attr_params|
               attr_params.to_hash.symbolize_keys!
-              if attr_params["_type"].present?
-                attr_class = attr_params.delete("_type").to_s.constantize
-              end
               array << attr_class.new(attr_params)
             end
             instance_variable_set("@#{association}", array)

data/lib/string_helper.rb

@@ -0,0 +1,18 @@
+require 'active_support/core_ext/string'
+
+class StringHelper
+  
+  def self.to_class(word)
+    singularize(word.to_s).camelize.constantize
+  end
+
+  # super simple singularizer
+  def self.singularize(word)
+    word.gsub /(.*)s/,'\1'
+  end
+
+  def self.constantize(word)
+    word.constantize
+  end
+
+end

data/logical_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.5.11"
+  s.version = "0.5.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
-  s.date = "2014-04-19"
+  s.date = "2014-04-20"
   s.description = "LogicalModel allows to use a resource as a model. It is based on web presentation http://www.slideshare.net/ihower/serviceoriented-design-and-implement-with-rails3"
   s.email = "dwaynemac@gmail.com"
   s.extra_rdoc_files = [
@@ -43,11 +43,13 @@ Gem::Specification.new do |s|
     "lib/logical_model/rest_actions.rb",
     "lib/logical_model/safe_log.rb",
     "lib/logical_model/url_helper.rb",
+    "lib/string_helper.rb",
     "lib/typhoeus_fix/array_decoder.rb",
     "log/logical_model.log",
     "logical_model.gemspec",
     "models/user.rb",
     "spec/client_spec.rb",
+    "spec/lib/logical_model/associations/has_many_keys_spec.rb",
     "test/helper.rb",
     "test/test_logical_model.rb",
     "test/typhoeus_mocks.rb"
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<typhoeus>, ["= 0.5.0.alpha"])
       s.add_runtime_dependency(%q<ethon>, ["= 0.4.2"])
       s.add_runtime_dependency(%q<kaminari>, ["~> 0.13.0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -87,6 +90,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<typhoeus>, ["= 0.5.0.alpha"])
       s.add_dependency(%q<ethon>, ["= 0.4.2"])
       s.add_dependency(%q<kaminari>, ["~> 0.13.0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -108,6 +112,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<typhoeus>, ["= 0.5.0.alpha"])
     s.add_dependency(%q<ethon>, ["= 0.4.2"])
     s.add_dependency(%q<kaminari>, ["~> 0.13.0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])

data/spec/lib/logical_model/associations/has_many_keys_spec.rb

@@ -0,0 +1,98 @@
+require './lib/logical_model/associations/has_many_keys.rb'
+
+describe LogicalModel::Associations::HasManyKeys do
+
+  describe "when included" do
+    before do
+      class Example
+        include LogicalModel::Associations::HasManyKeys
+      end
+    end
+
+    it "adds has_many class method" do
+      Example.should respond_to :has_many
+    end
+  end
+
+  describe ".has_many" do
+    before do
+      # has_many :items needs Item class
+      class Item
+        attr_accessor :example_id
+        attr_accessor :name
+        def initialize(attrs={})
+          @example_id = attrs['example_id']
+          @name = attrs['name']
+        end
+      end
+
+      class Example
+        include LogicalModel::Associations::HasManyKeys
+        has_many :items
+
+        def initialize(atrs={})
+          self.items = atrs[:items] if atrs[:items]
+        end
+
+        def json_root
+          'example'
+        end
+
+        def id
+          '234'
+        end
+      end
+    end
+
+    describe "adds #association= setter" do
+      it "visible at instance" do
+        e = Example.new
+        e.should respond_to 'items='
+      end
+
+      it "wich accepts attributes" do
+        e = Example.new
+        e.items= [{'name' => 'bob'}]
+        e.items.first.name.should == 'bob'
+      end
+
+      it "with accepts objects" do
+        res = [Item.new]
+        e = Example.new
+        e.items= res
+        e.items.should == res
+      end
+
+    end
+
+    describe "adds #association accessor" do
+      before do
+        debugger
+        @e = Example.new(items: [Item.new()])
+      end
+      it "visible at instance" do
+        @e.should respond_to :items
+      end
+
+      it "wich returns array of objects" do
+        @e.items.should be_a Array
+        @e.items.first.should be_a Item
+      end
+    end
+
+    describe "adds #new_xxx method" do
+      it "allow initializing new objects of association" do
+        e = Example.new
+        i = e.new_item( {} )
+        i.should be_a Item
+      end
+
+      it "initializes objects with parents id" do
+        e = Example.new
+        i = e.new_item( {} )
+        i.example_id.should == e.id
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-19 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -91,6 +91,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.13.0
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -350,11 +366,13 @@ files:
 - lib/logical_model/rest_actions.rb
 - lib/logical_model/safe_log.rb
 - lib/logical_model/url_helper.rb
+- lib/string_helper.rb
 - lib/typhoeus_fix/array_decoder.rb
 - log/logical_model.log
 - logical_model.gemspec
 - models/user.rb
 - spec/client_spec.rb
+- spec/lib/logical_model/associations/has_many_keys_spec.rb
 - test/helper.rb
 - test/test_logical_model.rb
 - test/typhoeus_mocks.rb
@@ -373,7 +391,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -888068301
+      hash: 474828961
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: