logical_model 0.5.5 → 0.5.7

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+bundler_args: --without development production
+rvm:
+ - 1.9.2
+ - 1.9.3
+ - 2.0.0

data/Gemfile

@@ -8,15 +8,16 @@ gem "ethon", "0.4.2"
 gem "kaminari", '~> 0.13.0'
 
 group :development, :test do
+  gem 'rake'
   gem 'activerecord'
   gem "shoulda"
-  gem "bundler", "~> 1.2.2"
+  gem "bundler", ">= 1.2.2"
   gem "jeweler", "~> 1.6.4"
   gem "rcov"
-	gem "sqlite3-ruby"
-	gem "sinatra", " ~> 1.2.6"
-	gem "json"
-	gem 'gemcutter'
+  gem "sqlite3-ruby"
+  gem "sinatra", " ~> 1.2.6"
+  gem "json"
+  gem 'gemcutter'
 	
   gem "rspec-rails"
 

data/Gemfile.lock

@@ -111,7 +111,7 @@ DEPENDENCIES
   activemodel
   activerecord
   activesupport
-  bundler (~> 1.2.2)
+  bundler (>= 1.2.2)
   ethon (= 0.4.2)
   gemcutter
   guard-rspec
@@ -119,6 +119,7 @@ DEPENDENCIES
   json
   kaminari (~> 0.13.0)
   libnotify
+  rake
   rb-inotify
   rcov
   rspec-rails

data/README.rdoc

@@ -1,3 +1,6 @@
+{<img src="https://badge.fury.io/rb/logical_model.png" alt="Gem Version" />}[http://badge.fury.io/rb/logical_model]
+{<img src="https://travis-ci.org/dwaynemac/logical_model.png" />}[https://travis-ci.org/dwaynemac/logical_model]
+{<img src="https://codeclimate.com/github/dwaynemac/logical_model.png" />}[https://codeclimate.com/github/dwaynemac/logical_model]
 = logical_model
 
 LogicalModel allows to use a RESTfull resources as models.
@@ -57,7 +60,10 @@ In a model file:
 
       set_resource_host "remote.server"
       set_resource_path "/api/remote/path"
-      # equivalente: set_resource_url "remote.server", "/api/path"
+      # equivalent: set_resource_url "remote.server", "/api/remote/path"
+
+      # optional
+      set_api_key(:token, 'asdfasdf') # will add token=asdfasdf to all requests.
 
       attribute :id
       attribute :attribute_a

data/VERSION

@@ -1 +1 @@
-0.5.5
+0.5.7

data/lib/logical_model/belongs_to.rb

@@ -14,17 +14,27 @@ class LogicalModel
         attr_class = get_attr_class(key, options)
 
         define_method("#{key}=") do |param|
-          param.stringify_keys!
-
-          instance_variable_set("@#{key}_id", param['id']) if param['id']
-
-          instance = attr_class.new(param)
+          if param.is_a?(Hash)
+            param.stringify_keys!
+            instance_variable_set("@#{key}_id", param['id']) if param['id']
+            instance = attr_class.new(param)
+          elsif param.is_a?(attr_class)
+            instance_variable_set("@#{key}_id", param.id)
+            instance = param
+          else
+            # ...
+          end
 
           instance_variable_set("@#{key}",instance)
         end
 
         define_method(key) do
-          eval("@#{key}")
+          instance = eval("@#{key}")
+          if instance.nil?
+            instance = attr_class.find(eval("#{key}_id"))
+            instance_variable_set("@#{key}",instance)
+          end
+          instance
         end
 
         # TODO define_method("#{key}_attribute="){|param| ... }

data/lib/logical_model/url_helper.rb

@@ -72,6 +72,22 @@ class LogicalModel
         ssl_recommended_environments = %W(production staging)
         ssl_recommended_environments.include?(defined?(Rails)? Rails.env : ENV['RACK_ENV'] )
       end
+
+      # Requests done within the block will go to new path.
+      #
+      # @example
+      #   @resource_path # '/comments'
+      #   do_with_resource_path("users/#{@user_id}/#{@resource_path}"}/") do
+      #     @resource_path # '/users/23/comments'
+      #   end
+      #
+      # @param [String] new_path
+      def do_with_resource_path(new_path)
+        bkp_path = @resource_path
+        @resource_path = new_path
+        yield
+        @resource_path = bkp_path
+      end
     end
 
   end

data/lib/typhoeus_fix/array_decoder.rb

@@ -14,82 +14,65 @@
 #    end
 #
 module TyphoeusFix
-
+  # Recursively decodes Typhoeus encoded arrays in given Hash.
+  #
+  # @example Use directly in a Rails controller.
+  #    class ApplicationController
+  #       before_filter :decode_typhoeus_arrays
+  #    end
+  #
+  # @author Dwayne Macgowan
+  #
   def decode_typhoeus_arrays
-    deep_decode(params)
+    decode!(params)
   end
 
-  # Recursively decode Typhoeus encoded arrays
-  def deep_decode(hash)
+  # Recursively decodes Typhoeus encoded arrays in given Hash.
+  #
+  # @param hash [Hash]. This Hash will be modified!
+  #
+  # @return [Hash] Hash with properly decoded nested arrays.
+  def decode!(hash)
     return hash unless hash.is_a?(Hash)
     hash.each_pair do |key,value|
       if value.is_a?(Hash)
-        deep_decode(value)
-        hash[key] = value.decode_typhoeus_array
+        decode!(value)
+        hash[key] = convert(value)
       end
     end
+    hash
   end
-end
 
-# Add Hash#is_typhoeus_array? method
-class Hash
+  def decode(hash)
+    decode!(hash.dup)
+  end
+
+  private
 
-  # Checks if hash is an Array encoded as a hash.
-  # Specifically will check for the hash to have this form: {'0' => v0, '1' => v1, .., 'n' => vN }
-  # @return [TrueClass]
-  def im_an_array_typhoeus_encoded?
-    return false if self.empty?
-    #return if array is empty or the key is not a valid number
-    return false if self.empty? || self.keys.first.match(/\A[+-]?\d+?(\.\d+)?\Z/) == nil
-    self.keys.map {|k| k.to_i}.sort == (0...self.keys.size).map {|i| i}
+  # Checks if Hash is an Array encoded as a Hash.
+  # Specifically will check for the Hash to have this
+  # form: {'0' => v0, '1' => v1, .., 'n' => vN }
+  #
+  # @param hash [Hash]
+  #
+  # @return [Boolean] True if its a encoded Array, else false.
+  def encoded?(hash)
+    return false if hash.empty?
+    keys = hash.keys.map{|i| i.to_i if i.respond_to?(:to_i)}.sort
+    keys == hash.keys.size.times.to_a
   end
 
-  # If the hash is an array encoded by typhoeus an array is returned
+  # If the Hash is an array encoded by typhoeus an array is returned
   # else the self is returned
   #
-  # @see im_an_array_typhoeus_encoded?
+  # @param hash [Hash] The Hash to convert into an Array.
   #
-  # @return [Array/Hash]
-  def decode_typhoeus_array
-    if self.im_an_array_typhoeus_encoded?
-      Hash[self.sort].values
+  # @return [Arraya/Hash]
+  def convert(hash)
+    if encoded?(hash)
+      Hash[hash.sort].values
     else
-      self
-    end
-  end
-end
-
-
-
-# Rack Middleware to fix Typhoeus arrays encoding
-# TODO this middleware didn't work, when fixed use it and remove filter from ApplicationController
-=begin
-module Typhoeus
-  class ArraysDecoder
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-
-      params = env["action_dispatch.request.parameters"]
-      decode_typho_arrays(params)
-      env["action_dispatch.request.parameters"] = params
-      @app.call(env)
-    end
-
-    private
-
-    # Recursively decode Typhoeus encoded arrays
-    def decode_typho_arrays(hash)
-      return hash unless hash.is_a?(Hash)
-      hash.each_pair do |key,value|
-        if value.is_a?(Hash)
-          decode_typho_arrays(value)
-          hash[key] = value.decode_typhoeus_array
-        end
-      end
+      hash
     end
   end
-end
-=end
+end

data/logical_model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.5.5"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
-  s.date = "2013-06-18"
+  s.date = "2013-07-12"
   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 = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
     "Guardfile",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/logical_model/safe_log.rb",
     "lib/logical_model/url_helper.rb",
     "lib/typhoeus_fix/array_decoder.rb",
+    "log/logical_model.log",
     "logical_model.gemspec",
     "models/user.rb",
     "spec/client_spec.rb",
@@ -64,9 +66,10 @@ 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<rake>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.2.2"])
+      s.add_development_dependency(%q<bundler>, [">= 1.2.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -83,9 +86,10 @@ 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<rake>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.2.2"])
+      s.add_dependency(%q<bundler>, [">= 1.2.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
@@ -103,9 +107,10 @@ 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<rake>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.2.2"])
+    s.add_dependency(%q<bundler>, [">= 1.2.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])

data/spec/client_spec.rb

@@ -27,6 +27,43 @@ describe "LogicalModel User client" do
     end
   end
 
+  describe "belongs_to :account" do
+    before do
+      class Account < LogicalModel
+        attribute :id
+        attribute :name
+      end
+      class User < LogicalModel
+        belongs_to :account
+      end
+
+      @account = Account.new(id: 1, name: 'asdf')
+      Account.stub(:find).with(1).and_return(@account)
+    end
+    it "responds to account_id" do
+      User.new.should respond_to :account_id
+    end
+    it "responds to account" do
+      User.new.should respond_to :account
+    end
+    it "allows to set association_id=x" do
+      u = User.new
+      u.account_id = 1
+      u.account.should == @account
+    end
+    it "allows to set association=Object" do
+      u = User.new
+      u.account = @account
+      u.account_id.should == 1
+    end
+    it "allows to set association=AttributesHash" do
+      u = User.new
+      u.account = {id: 3, name: 'account_name'}
+      u.account.should be_a Account
+      u.account.name.should == 'account_name'
+    end
+  end
+
   describe "RESTActions" do
     %W(find async_find paginate async_paginate delete delete_multiple).each do |class_action|
       it { should respond_to class_action }
@@ -67,6 +104,22 @@ describe "LogicalModel User client" do
         User.host.should == "new_host"
       end
     end
+    describe "do_with_resource_path" do
+      before do
+        User.set_resource_path("/api/v1/users")
+      end
+      it "changes resource_path within the block" do
+        User.do_with_resource_path('/api/v1/accounts/12/users') do
+          User.resource_path.should == '/api/v1/accounts/12/users'
+        end
+      end
+      it "restores path after block" do
+        User.do_with_resource_path('/api/v1/accounts/12/users') do
+          # ...
+        end
+        User.resource_path.should == "/api/v1/users"
+      end
+    end
   end
 
   describe "safe_log" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-07-12 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: rake
+  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: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -128,7 +144,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
   type: :development
@@ -136,7 +152,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.2
 - !ruby/object:Gem::Dependency
@@ -309,6 +325,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -333,6 +350,7 @@ files:
 - lib/logical_model/safe_log.rb
 - lib/logical_model/url_helper.rb
 - lib/typhoeus_fix/array_decoder.rb
+- log/logical_model.log
 - logical_model.gemspec
 - models/user.rb
 - spec/client_spec.rb
@@ -354,7 +372,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 551778145
+      hash: 364483183
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: