web-connect 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a78c316aa0dd58c987d6a68648bdf9d2af9f851
-  data.tar.gz: 41e0fb236184473185bbd711308fe1a87ed9810d
+  metadata.gz: f63aefe6e3d4e57c35a13b8d50c498cd4f251af7
+  data.tar.gz: cb70abe3467ee489bf9f3360575ce59304d2a420
 SHA512:
-  metadata.gz: 6eab39887c6b60a94689193dc3d0cb167f7e32c37d76eee2b1803b013db5819413c643b26d3bf25b6d0762f4ae83c9baae5b1c61399597cb2548fa943fa36b3e
-  data.tar.gz: 696ab4061e29e06d5c394c087476a3e20540c00e5b66c84a20123990771f4a2c3119be3780d58bc391d76d4b02e3af137acdaeec7f36a4a15449e63de13753f1
+  metadata.gz: c24950ca0f415a5281c454952ed7b16df6822af7e2a3e5b296c6db10be5b2281e7917f4e737db8759ce0852a868c6607664bdde658b7482c03b9128a58250af0
+  data.tar.gz: 1103b12151704ba54c8e69f707d7aa5b07174e49c6abc6e92949ea5b09bbac33efc7e2c86c614cdfc3a23cbfa7f40a877631a2846d549e2f992ccacf84dd4ce3

data/lib/netfira/web_connect/model/relation.rb

@@ -10,11 +10,11 @@ module Netfira::WebConnect
 
       def materialize(name_a, name_b)
 
-        # The new class, e.g. Models::CategoryToProduct
+        # The new class, e.g. Models::ImageToProduct
         klass = Class.new(self)
         Models.const_set "#{name_a}To#{name_b}", klass
 
-        # An array of related classes, e.g. [Models::Category, Models::Product]
+        # An array of related classes, e.g. [Models::Image, Models::Product]
         klass.related_classes = [name_a, name_b].map{ |n| Models.const_get n.camelize.singularize }
 
         # Sets up paranoia, including a with_deleted scope for consistency
@@ -25,10 +25,10 @@ module Netfira::WebConnect
         end
 
         # Enables finding by origin IDs, e.g.:
-        # CategoryToProduct.find_by_origin_ids(category: 'fruit', product: 'apple', shop: 5)
+        # ImageToProduct.find_by_origin_ids(image: 'apple.jpg', product: 'apple', shop: 5)
         find_by_origin_ids = proc do |**args|
 
-          # The table of the current class, e.g. nf_categories_to_products
+          # The table of the current class, e.g. nf_images_to_products
           join_table = klass.arel_table
 
           # The scope we're building
@@ -44,28 +44,31 @@ module Netfira::WebConnect
           # Join each class and add where clauses
           klass.related_classes.each do |related_class|
 
-            # The related table, e.g. nf_products
+            # The related table, e.g. nf_images
             related_table = related_class.arel_table
 
-            # The argument expected to identify the relevant row of the table, e.g. :product
+            # The argument expected to identify the relevant row of the table, e.g. :image
             origin_id_arg = related_class.single_name.to_sym
 
-            # The origin ID to find in the table, e.g. 'apple'
+            # The origin ID to find in the table, e.g. 'apple.jpg'
             origin_id = args[origin_id_arg] or raise "Missing argument `#{origin_id_arg}`"
 
-            # The column in which to seek the origin ID, e.g. :product_id
+            # The column of the related table in which to seek the origin ID, e.g. :file_name
             origin_key = related_class.origin_key.to_sym
 
+            # The column on which to join the relation table, e.g. :image_id
+            join_key = :"#{related_class.single_name}_id"
+
             # Join the related table, e.g.:
-            # INNER JOIN "nf_products" ON "nf_categories_to_products"."product_id" = "nf_products"."id"
-            scope = scope.joins join_table.join(related_table).on(join_table[origin_key].eq related_table[:id]).join_sql
+            # INNER JOIN "nf_images" ON "nf_images_to_products"."image_id" = "nf_images"."id"
+            scope = scope.joins join_table.join(related_table).on(join_table[join_key].eq related_table[:id]).join_sql
 
             # Look for the origin ID, e.g.:
-            # WHERE "nf_products"."product_id" = 'apple'
+            # WHERE "nf_images"."file_name" = 'apple.jpg'
             scope = scope.where related_table[origin_key].eq origin_id
 
             # Limit to the given shop, e.g.:
-            # AND "nf_products"."shop_id" = 5
+            # AND "nf_images"."shop_id" = 5
             scope = scope.where related_table[:shop_id].eq shop if shop
           end
 

data/lib/netfira/web_connect/version.rb

@@ -1,6 +1,6 @@
 module Netfira
   module WebConnect
-    VERSION = '0.4.4'
+    VERSION = '0.4.5'
     PLATFORM_AND_VERSION = 'Rack/' << VERSION
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web-connect
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord