logical_model 0.4.8 → 0.4.10

data/Gemfile

@@ -3,7 +3,8 @@ source "http://rubygems.org"
 
 gem "activemodel"
 gem "activesupport"
-gem "typhoeus", '0.5.1'
+gem "typhoeus", '0.5.0.alpha'
+gem "ethon", "0.4.2"
 gem "kaminari", '~> 0.13.0'
 
 group :development, :test do

data/Gemfile.lock

@@ -27,7 +27,7 @@ GEM
     builder (3.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ethon (0.5.3)
+    ethon (0.4.2)
       ffi (~> 1.0.11)
       mime-types (~> 1.18)
     ffi (1.0.11)
@@ -50,7 +50,7 @@ GEM
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
     libnotify (0.7.1)
-    mime-types (1.22)
+    mime-types (1.23)
     multi_json (1.0.4)
     rack (1.3.6)
     rack-cache (1.1)
@@ -100,8 +100,8 @@ GEM
       sqlite3 (>= 1.3.3)
     thor (0.14.6)
     tilt (1.3.3)
-    typhoeus (0.5.1)
-      ethon (= 0.5.3)
+    typhoeus (0.5.0.alpha)
+      ethon (~> 0.4.2)
     tzinfo (0.3.31)
 
 PLATFORMS
@@ -112,6 +112,7 @@ DEPENDENCIES
   activerecord
   activesupport
   bundler (~> 1.2.2)
+  ethon (= 0.4.2)
   gemcutter
   guard-rspec
   jeweler (~> 1.6.4)
@@ -124,4 +125,4 @@ DEPENDENCIES
   shoulda
   sinatra (~> 1.2.6)
   sqlite3-ruby
-  typhoeus (= 0.5.1)
+  typhoeus (= 0.5.0.alpha)

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.10

data/lib/logical_model.rb

@@ -6,6 +6,7 @@ require 'logger'
 require 'kaminari'
 require 'ssl_support'
 require 'safe_log'
+require 'logical_model/has_many_keys'
 
 # Logical Model, not persistant on DB, works through API. (replaces ActiveResource)
 #
@@ -46,6 +47,8 @@ class LogicalModel
   include SslSupport
   extend SafeLog
 
+  extend LogicalModel::HasManyKeys
+
   # include ActiveModel Modules that are usefull
   extend ActiveModel::Naming
   include ActiveModel::Conversion
@@ -123,70 +126,6 @@ class LogicalModel
     self.attributes = attributes
   end
 
-  def self.has_many_keys=(keys)
-    @has_many_keys = keys
-    attr_accessor *keys
-
-    keys.each do |association|
-
-      # return empty array or @association variable for each association
-      define_method association do
-        if instance_variable_get("@#{association}").blank?
-          instance_variable_set("@#{association}", [])
-        end
-
-        instance_variable_get("@#{association}")
-      end
-
-      # this method loads the contact attributes recieved by logical model from the service
-      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
-          else
-            attr_class = association.to_s.singularize.camelize.constantize
-          end
-          collection << attr_class.new(attr_params)
-        end
-        instance_variable_set("@#{association}", collection)
-      end
-
-      define_method "new_#{association.to_s.singularize}" do |attr_params|
-        if attr_params["_type"].present?
-          clazz = attr_params.delete(:_type).constantize
-        else
-          clazz = association.to_s.singularize.camelize.constantize
-        end
-
-        return unless clazz
-
-        temp_object = clazz.new(attr_params.merge({"#{self.json_root}_id" => self.id}))
-        eval(association.to_s) << temp_object
-        temp_object
-      end
-
-      # this method loads the contact attributes from the html form (using nested resources conventions)
-      define_method "#{association}_attributes=" do |key_attributes|
-          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
-            else
-              attr_class = association.to_s.singularize.camelize.constantize
-            end
-            array << attr_class.new(attr_params)
-          end
-          instance_variable_set("@#{association}", array)
-      end
-    end
-  end
-
-  def self.has_many_keys
-    @has_many_keys
-  end
-
   def attributes
     attrs = self.class.attribute_keys.inject(ActiveSupport::HashWithIndifferentAccess.new) do |result,key|
       result[key] = read_attribute_for_validation(key)

data/lib/logical_model/has_many_keys.rb

@@ -0,0 +1,69 @@
+class LogicalModel
+  module HasManyKeys
+
+    def has_many_keys=(keys)
+      @has_many_keys = keys
+      attr_accessor *keys
+
+      keys.each do |association|
+
+        # return empty array or @association variable for each association
+        define_method association do
+          if instance_variable_get("@#{association}").blank?
+            instance_variable_set("@#{association}", [])
+          end
+
+          instance_variable_get("@#{association}")
+        end
+
+        # this method loads the contact attributes recieved by logical model from the service
+        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
+            else
+              attr_class = association.to_s.singularize.camelize.constantize
+            end
+            collection << attr_class.new(attr_params)
+          end
+          instance_variable_set("@#{association}", collection)
+        end
+
+        define_method "new_#{association.to_s.singularize}" do |attr_params|
+          if attr_params["_type"].present?
+            clazz = attr_params.delete(:_type).constantize
+          else
+            clazz = association.to_s.singularize.camelize.constantize
+          end
+
+          return unless clazz
+
+          temp_object = clazz.new(attr_params.merge({"#{self.json_root}_id" => self.id}))
+          eval(association.to_s) << temp_object
+          temp_object
+        end
+
+        # this method loads the contact attributes from the html form (using nested resources conventions)
+        define_method "#{association}_attributes=" do |key_attributes|
+          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
+            else
+              attr_class = association.to_s.singularize.camelize.constantize
+            end
+            array << attr_class.new(attr_params)
+          end
+          instance_variable_set("@#{association}", array)
+        end
+      end
+    end
+
+    def has_many_keys
+      @has_many_keys
+    end
+
+  end
+end

data/lib/safe_log.rb

@@ -3,9 +3,9 @@ module SafeLog
   # Filters api_key
   # @return [String]
   def mask_api_key(str)
-    if use_api_key && api_key && str
+    if use_api_key && str
       str = str.gsub(api_key,'[SECRET]')
     end
     str
   end
-end
+end

data/logical_model.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "logical_model"
-  s.version = "0.4.8"
+  s.version = "0.4.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dwayne Macgowan"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "db/development.sqlite3",
     "db/migrate/001_create_users.rb",
     "lib/logical_model.rb",
+    "lib/logical_model/has_many_keys.rb",
     "lib/safe_log.rb",
     "lib/ssl_support.rb",
     "lib/typhoeus_fix/array_decoder.rb",
@@ -54,7 +55,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activemodel>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<typhoeus>, ["= 0.5.1"])
+      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<activerecord>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
@@ -72,7 +74,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<activemodel>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<typhoeus>, ["= 0.5.1"])
+      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<activerecord>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
@@ -91,7 +94,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activemodel>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<typhoeus>, ["= 0.5.1"])
+    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<activerecord>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logical_model
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,23 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.0.alpha
+- !ruby/object:Gem::Dependency
+  name: ethon
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -307,6 +323,7 @@ files:
 - db/development.sqlite3
 - db/migrate/001_create_users.rb
 - lib/logical_model.rb
+- lib/logical_model/has_many_keys.rb
 - lib/safe_log.rb
 - lib/ssl_support.rb
 - lib/typhoeus_fix/array_decoder.rb
@@ -331,7 +348,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 365014127
+      hash: -711400131
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: