yaml_b_sides 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 290831d7f1b375fdc3677f8482747c435028ac5f
-  data.tar.gz: 8ee7a67ada8164e8bbdbeb53fae5e49b9fc99f5c
+  metadata.gz: 7cce0a0ddcc46c69a3a4c195187c7be25009b4b2
+  data.tar.gz: b6d69e0b119b8e6696ce4fa3195c6847eae28d1c
 SHA512:
-  metadata.gz: a9e7b2bd03c35870aec5feb6ba9a42ffd79a139f05969a79b8a6f58d9454928261c139dec9a40289a1fe9e75c3855823b9ecc3d5f3046e37b1525d9d48992118
-  data.tar.gz: 9066c18974a19653f8adb232a53daea75ce2dcceb26a6c88b9eb3e14c67bd7871e6e7841555852277d8a16f8625104fb49c4c51cd3978f22addf9590c29c2a6e
+  metadata.gz: 46477bf5fabecaaac51a0bbb457fa7b60720141a5a4e426191c4ba54578814b04f928a37044438cf144305db733bd3dcfda9831e0fa16f8a8bb0f4abec4ef115
+  data.tar.gz: c3636b15c10d3621df75184df1fabe107a4c1d0238e6e5244ee78f4087de385ba1e14083fdd7047dc45ce8a46e706ad491d7323d54befde928eb8165a56f32e5

data/README.md

@@ -75,6 +75,45 @@ You can define simple associations that behave very much like ActiveRecord assoc
 * `has_many`: the association object has the id of the base.
   * will return an array
 
+#### Assocaition Options
+
+Associations have some of the standard ActiveRecord options. Namely:
+* `class`: specifies the class to find the record in.
+  
+  ```ruby
+    has_one :special_thing, class: Thing
+  ```
+
+* `class_name`: specifies the class w.o having to have the class defined. Handy for circular dependencies
+  
+  ```ruby
+    class Person < YamlBSides::Base
+      has_one :nickname, class_name: "Pesudonym"
+    end
+
+    class Pseudonym < YamlBSides::Base
+      belongs_to :bearer, class_name: "Person"
+    end
+  ```
+
+* `through`: many to may association helper. 
+  
+    ```ruby
+    class Person < YamlBSides::Base
+      has_many :person_foods
+      has_many :favorite_foods, through: :person_foods, class_name: "Food"
+    end
+
+    class PersonFood < YamlBSides::Base
+      belongs_to :person
+      belongs_to :food
+    end
+
+    class Food < YamlBSides::Base
+    end
+  ```
+  
+  __NOTE__: only works for `has_one` and `has_many`
 
 ### Example
 

data/lib/yaml_b_sides/associations.rb

@@ -4,5 +4,6 @@ module YamlBSides
     autoload :BelongsTo,  'yaml_b_sides/associations/belongs_to'
     autoload :HasMany,    'yaml_b_sides/associations/has_many'
     autoload :HasOne,     'yaml_b_sides/associations/has_one'
+    autoload :Through,    'yaml_b_sides/associations/through'
   end
 end

data/lib/yaml_b_sides/associations/base.rb

@@ -7,7 +7,7 @@ module YamlBSides
       def initialize( base_class, name, opts = {} )
         self.name = name
         self.opts = opts
-        self.key  = "#{base_class.to_s.demodulize.underscore}_id" 
+        self.key  = idify base_class
       end
 
       def klass
@@ -19,15 +19,17 @@ module YamlBSides
       def association_class( name, opts = {} )
         a_class       = opts[:class]                   if opts.has_key? :class
         a_class_name  = opts[:class_name].constantize  if opts.has_key? :class_name
-        derived_class = derived_class_for name
 
-        a_class || a_class_name || derived_class
+        a_class || a_class_name || derived_class_for( name )
       end
 
       def derived_class_for( name )
         name.to_s.singularize.classify.constantize
       end
 
+      def idify( class_name )
+        "#{class_name.to_s.demodulize.underscore}_id"
+      end
     end
   end
 end

data/lib/yaml_b_sides/associations/has_many.rb

@@ -1,13 +1,11 @@
 module YamlBSides
   module Associations
     class HasMany < Base
+      include Through
+
       def action
         :where
       end
-
-      def query( instance )
-        { key => instance.id }
-      end
     end
   end
 end

data/lib/yaml_b_sides/associations/has_one.rb

@@ -1,13 +1,11 @@
 module YamlBSides
   module Associations
     class HasOne < Base
+      include Through 
+
       def action
         :find_by
       end
-
-      def query( instance )
-        { key => instance.id }
-      end
     end
   end
 end

data/lib/yaml_b_sides/associations/through.rb

@@ -0,0 +1,36 @@
+module YamlBSides
+  module Associations
+    module Through
+      extend ActiveSupport::Concern
+
+      included do
+
+        def query( instance )
+          unless opts.has_key? :through
+            { key => instance.id }
+          else
+            { id: target_ids( instance ) }
+          end
+        end
+
+        protected
+
+        def through
+          opts[:through]
+        end
+
+        def target_ids( instance )
+          intermadiates = Array(instance.send( through ) )
+          
+          intermadiates.map do | intermediate | 
+            intermediate.send( through_key )
+          end
+        end
+        
+        def through_key
+          idify klass
+        end
+      end
+    end
+  end
+end

data/lib/yaml_b_sides/index.rb

@@ -5,12 +5,19 @@ module YamlBSides
       data.each do |id, datum|
         key = datum[field]
 
+        # storing key => array of matching ids
         @indexed_data[key] = Array(@indexed_data[key]) + [id]
       end
     end
 
-    def find(value)
-      @indexed_data[value]
+    # returns ids 
+    def find(values)
+      # find all the arrays of ids for the values, 
+      #   get rid of nils (value not present), 
+      #   and compact for a single array result
+      values.map do |value|
+        @indexed_data[value]
+      end.compact.flatten
     end
   end
 end

data/lib/yaml_b_sides/indexable.rb

@@ -11,8 +11,8 @@ module YamlBSides
           self.__indices = __indices.merge( { field => Index.new(field, @data) } )
         end
 
-        def find_in_index(field, value)
-          keys = Array(index_for(field).find(value))
+        def find_in_index(field, values)
+          keys = Array(index_for(field).find(values))
           
           keys.map do |id|
             @data[id]

data/lib/yaml_b_sides/queriable.rb

@@ -42,16 +42,16 @@ module YamlBSides
 
         def find_by_scan(params)
           @data.values.select do |datum|
-            params.all? do |param, expcted_value|
-              datum[param] == expcted_value
+            params.all? do |param, expected_value|
+              val = Array(expected_value).include? datum[param]
             end
           end
         end
 
         def find_by_indexed(params)
           sets = []
-          params.each do |index, value|
-            sets << find_in_index(index, value)
+          params.each do |index, values|
+            sets << find_in_index(index, Array(values))
           end
 
           # find the intersection of all the sets

data/lib/yaml_b_sides/version.rb

@@ -1,3 +1,3 @@
 module YamlBSides
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/yaml_b_sides.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "m"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml_b_sides
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Greg Orlov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An ActiveRecord-like interface for reading from & queryeing flat yaml
   files
 email:
@@ -103,6 +117,7 @@ files:
 - lib/yaml_b_sides/associations/belongs_to.rb
 - lib/yaml_b_sides/associations/has_many.rb
 - lib/yaml_b_sides/associations/has_one.rb
+- lib/yaml_b_sides/associations/through.rb
 - lib/yaml_b_sides/base.rb
 - lib/yaml_b_sides/cacheable.rb
 - lib/yaml_b_sides/index.rb