fire-model 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91a1c4ef436ffa206209dd1c016e6ff2e5bed9cd
-  data.tar.gz: 1a962e4011f7345f1acbd3ef1ef7d454b8b4932b
+  metadata.gz: 94a83f0d48f12fff80f3b51db09f807a28333547
+  data.tar.gz: f27302a0d64efdfb24bc97f48ff8bb91090a3866
 SHA512:
-  metadata.gz: e37877348de04f72fbf0cea2718d2f53561764fd58af4267f746b10fbd010ce4dde637e8a4ec48ed99bafd2abde1ed613c87f4c2442a34d54f29dced2d0f1a6d
-  data.tar.gz: 149812eafc8aaad97d46ac596338c7868bf7ce0e33f0b5d794e3b86fbd8dcf54efbc4a9c375f58c72de722887f9011772cd58b6c290c8e3808dc31ca7d1e8dd4
+  metadata.gz: 311cb999666f276d673a64ccb98df22200b133181ef7badfc28ffb66eb77138c66db5d39f4f0f7a1ee53926961ba464ae39c9a6496643177b0d47018562aae12
+  data.tar.gz: 7e868d0828ccd06dea11d2ecbf167e8f9eabe40b75cc9252d007780fb06fccfea47ddbc2d321072a1876fa0e76e5792eaff13cc21e64a371dde81522c6277f3c

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/fire-model.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: fire-model 0.0.8 ruby lib
+# stub: fire-model 0.0.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "fire-model"
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
     "lib/connection/request.rb",
     "lib/connection/response.rb",
     "lib/fire-model.rb",
-    "lib/model/model.rb",
+    "lib/model/base.rb",
     "lib/model/nested/nested_model.rb",
     "lib/model/nested/parent.rb",
     "lib/model/querying/querying.rb",

data/lib/fire-model.rb

@@ -1,7 +1,7 @@
 module Fire
   require 'connection/response'
   require 'connection/request'
-  require 'model/model'
+  require 'model/base'
 
   require 'ostruct'
 

data/lib/model/{model.rb → base.rb}

@@ -196,9 +196,9 @@ module Fire
     end
 
     require_relative './querying/querying'
-    require_relative './nested/parent'
     require_relative './nested/nested_model'
+    require_relative './nested/parent'
     include Querying
-    include Parent
+    include NestedModel::Parent
   end
-end
+end

data/lib/model/nested/nested_model.rb

@@ -24,24 +24,28 @@ module Fire
         end
       end
 
-      def nested_in(parent, options)
+      def nested_in(parent, options={})
         self.parent = parent
         self.nested_options = OpenStruct.new(options)
         self.parent.has_nested(self)
       end
 
       def own_path_keys
-        parent.all_path_keys + [ nested_options.folder ] + super()
+        parent.all_path_keys + [ folder ] + super()
       end
 
       def collection_name
         parent.collection_name
       end
+
+      def folder
+        path_value_param(self.nested_options.folder ? self.nested_options.folder : to_s.pluralize)
+      end
     end
 
     def method_missing(*args)
-      if args.first.to_s == self.class.nested_options.folder
-        self.class.nested_options.folder
+      if args.first.to_s == self.class.folder
+        self.class.folder
       else
         super
       end

data/lib/model/nested/parent.rb

@@ -1,5 +1,5 @@
 module Fire
-  class Model
+  class NestedModel
     module Parent
       extend ActiveSupport::Concern
 
@@ -13,9 +13,9 @@ module Fire
           self.assigned_nested_models ||= []
           self.assigned_nested_models << nested_model
 
-          folder = nested_model.nested_options.folder
+          folder = nested_model.folder
           define_method "nested_#{folder}" do
-            objects = self.class.down_levels(send(folder), nested_model.path_keys.count)
+            objects = self.class.down_levels(send(folder), (nested_model.path_keys || []).count)
             objects.map{|x|
               full_data = x.merge(self.path_data)
               nested_model.new(full_data)

data/lib/model/querying/querying.rb

@@ -6,34 +6,15 @@ module Fire
 
       module ClassMethods
         def query(params={}, &filter_condition)
-          path_values, selected_keys = [], []
+          direct_keys = direct_path_keys(params)
+          full_path = ([ collection_name ] + direct_path_values(params, direct_keys)) * LEVEL_SEPARATOR
 
-          own_path_keys.each do |key|
-            if params[key]
-              path_values << path_value_param(params[key])
-              selected_keys << key
-            else
-              break
-            end
-          end
-
-          full_path = ([ collection_name ] + path_values) * LEVEL_SEPARATOR
           response = connection.get(full_path).body
-
           return [] if response.nil?
 
-          result = down_levels(response, (own_path_keys - selected_keys).count)
-
-          filter = params.clone
-          selected_keys.each do |sk|
-            filter.delete(sk)
-          end
+          rows = down_levels(response, (own_path_keys - direct_keys).count)
 
-          result.map{|data| new(data) }.select do |model_object|
-            not_filtered_by_attributes = model_object.has_data?(filter)
-            not_filtered_by_block = block_given? ? filter_condition.(model_object) : true
-            not_filtered_by_attributes && not_filtered_by_block
-          end
+          filter_result(rows, filter_opts(params, direct_keys), filter_condition)
         end
 
         alias_method :all, :query
@@ -48,6 +29,34 @@ module Fire
           result
         end
 
+        def filter_result(rows, filter_opts, filter_condition)
+          rows.map{|data| new(data) }.select do |model_object|
+            not_filtered_by_attributes = model_object.has_data?(filter_opts)
+            not_filtered_by_block = filter_condition ? filter_condition.(model_object) : true
+            not_filtered_by_attributes && not_filtered_by_block
+          end
+        end
+
+        def direct_path_keys(params)
+          res = []
+          own_path_keys.each do |key|
+            params[key] ? (res << key) : break
+          end
+          res
+        end
+
+        def direct_path_values(params, direct_keys)
+          direct_keys.map do |dpk|
+            path_value_param(params[dpk])
+          end
+        end
+
+        def filter_opts(params, direct_keys)
+          direct_keys.each_with_object(params.clone) do |sk, res|
+            res.delete(sk)
+          end
+        end
+
       end
     end
   end

data/spec/models/nested_models_spec.rb

@@ -20,7 +20,7 @@ describe 'Nested Models' do
     expect(Organization.nested_models).to be_empty
 
     class Employee < Fire::NestedModel
-      nested_in Organization, folder: 'employees'
+      nested_in Organization
       has_path_keys :department
     end
 
@@ -115,7 +115,7 @@ describe 'Nested Models' do
   end
 
   context 'Restrictions' do
-    before :all do
+    before :each do
 
       class Hotel < Fire::Model
         has_path_keys :location, :class
@@ -128,6 +128,7 @@ describe 'Nested Models' do
       expect(->{
         class Room < Fire::NestedModel
           has_path_keys :number
+          nested_in Hotel, folder: 'rooms'
         end
       }).to raise_error(Fire::NestedModel::ParentModelNotSetError)
 
@@ -149,6 +150,7 @@ describe 'Nested Models' do
 
       expect(->{
         class Room < Fire::NestedModel
+          nested_in Hotel, folder: 'rooms'
           has_path_keys :number, :room_class
         end
       }).to be

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fire-model
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Vitaly Tarasenko
@@ -155,7 +155,7 @@ files:
 - lib/connection/request.rb
 - lib/connection/response.rb
 - lib/fire-model.rb
-- lib/model/model.rb
+- lib/model/base.rb
 - lib/model/nested/nested_model.rb
 - lib/model/nested/parent.rb
 - lib/model/querying/querying.rb