web-connect 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8bff92c7d13988bc68cf2aa9623c9621624319a
-  data.tar.gz: 303b28ea1214ce4c065527f0b5ab1efda2d2268c
+  metadata.gz: 435761d473e6207771accd7586c0c8b6003e7073
+  data.tar.gz: a17604aba5f073120cc6c3d5abe496f92e14a4b8
 SHA512:
-  metadata.gz: 7136d9aa509a71ff9d8208e5d463746d4f5d99c5a30ff1718ccd6427e7cbc0c95fc4432bf6f597b647f441d34b2070d77e875c430e635d9da114a506dd6882fb
-  data.tar.gz: 4b9672b379f9330b7537c35b88980de3405ac7d5294e3150af2814ac9049b8e9fb02a6f11b117cf533fc9ee6d20f85bc02b9b4d0ff99a46593e8e46077c41a41
+  metadata.gz: faa5af85ed89bebf95e56a031d1c15d59a44fb8becba703058e2c559cc85fa637799a62f14f369bbab378521c4e7f9c524c7506b9b56e34eed1547a75b96009c
+  data.tar.gz: de81cfb5722537b64e7e704b86f937e85904a4f7a37be182af4560307c309c5855cb30be65c0ca4bf7a5e932eff9a2cec883153685960ad90e01d4d9b6dd6349

data/lib/netfira/web_connect/db_schema/20140515_alpha.rb

@@ -44,8 +44,7 @@ class Alpha < Netfira::WebConnect::Migration
       t.boolean :show_on_website
     end
 
-    create_record_table :categories, with_l10n: true do |t|
-      t.integer :parent_id
+    create_record_table :categories, with_l10n: true, tree: true do |t|
       t.localized_string :name
     end
 

data/lib/netfira/web_connect/migration.rb

@@ -23,6 +23,10 @@ module Netfira::WebConnect
         t.string options[:origin_key] || :"#{table_name.to_s.singularize}_id", index: true unless options[:writable]
         yield t
         t.references :shop, index: true
+        if options[:tree]
+          t.string :parent_id
+          t.index [:shop_id, :parent_id]
+        end
         if options[:sendable]
           t.binary :guid, index: true
           t.integer :delivery_status, default: 0, limit: 3, index: true

data/lib/netfira/web_connect/model/record/tree.rb

@@ -2,11 +2,21 @@ module Netfira::WebConnect
   module Model::Record::Tree
 
     def children
-      self.class.where(parent_id: id)
+      (origin_id.nil? || origin_id.empty?) ? [] : self.class.where(shop_id: shop_id, parent_id: origin_id)
     end
 
     def parent
-      @parent ||= parent_id && self.class.find_by(id: parent_id)
+      @parent ||= parent_id && !parent_id.empty? && self.class.find_by(shop_id: shop_id, origin_key => parent_id)
+    end
+
+    def parent_id=(value)
+      if Fixnum === value
+        @parent = self.class.find(value)
+        value = @parent.origin_id
+      elsif value != parent_id
+        @parent = nil
+      end
+      self[:parent_id] = value
     end
 
   end

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

@@ -109,6 +109,9 @@ module Netfira::WebConnect
       schema = self.class.schema
       if schema.localize.include? key
         set_translated_string key, value
+      elsif key == :parent_id
+        value = value.to_s
+        write_attribute key, value.empty? ? nil : value
       else
         type = schema.columns[key]
         return false unless type

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

@@ -9,14 +9,70 @@ module Netfira::WebConnect
       attr_reader :related_classes
 
       def materialize(name_a, name_b)
+
+        # The new class, e.g. Models::CategoryToProduct
         klass = Class.new(self)
         Models.const_set "#{name_a}To#{name_b}", klass
+
+        # An array of related classes, e.g. [Models::Category, 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
         if Netfira::WebConnect.paranoia?
           klass.acts_as_paranoid
         else
           def klass.with_deleted; self end
         end
+
+        # Enables finding by origin IDs, e.g.:
+        # CategoryToProduct.find_by_origin_ids(category: 'fruit', product: 'apple', shop: 5)
+        find_by_origin_ids = proc do |**args|
+
+          # The table of the current class, e.g. nf_categories_to_products
+          join_table = klass.arel_table
+
+          # The scope we're building
+          scope = klass
+
+          # Include a shop in the scope if one is given
+          shop = args[:shop]
+          if shop
+            shop = shop.id if Models::Shop === shop
+            raise "`shop` must be an integer or an instance of #{Models::Shop.name}" unless Fixnum === shop
+          end
+
+          # Join each class and add where clauses
+          klass.related_classes.each do |related_class|
+
+            # The related table, e.g. nf_products
+            related_table = related_class.arel_table
+
+            # The argument expected to identify the relevant row of the table, e.g. :product
+            origin_id_arg = related_class.single_name.to_sym
+
+            # The origin ID to find in the table, e.g. 'apple'
+            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
+            origin_key = related_class.origin_key.to_sym
+
+            # 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
+
+            # Look for the origin ID, e.g.:
+            # WHERE "nf_products"."product_id" = 'apple'
+            scope = scope.where related_table[origin_key].eq origin_id
+
+            # Limit to the given shop, e.g.:
+            # AND "nf_products"."shop_id" = 5
+            scope = scope.where related_table[:shop_id].eq shop if shop
+          end
+
+          # Only look for one record.
+          scope.limit 1
+        end
+        klass.scope :find_by_origin_ids, find_by_origin_ids
       end
 
       def related_classes=(classes)
@@ -65,6 +121,12 @@ module Netfira::WebConnect
         Models.const_get name if Models.const_defined? name
       end
 
+      def for!(*args)
+        self.for(*args).tap do |result|
+          raise args.map { |c| (Class === c ? c : c.class).name.demodulize.pluralize }.join ' are not related to ' unless result
+        end
+      end
+
     end
 
     def records

data/lib/netfira/web_connect/models/support/shop.rb

@@ -17,6 +17,16 @@ module Netfira::WebConnect
       settings[:locale] || Netfira::WebConnect.system_locale
     end
 
+    def find_relation_by_origin_ids(**args)
+      raise ArgumentError, "Provide exactly 2 origin IDs, e.g. :product => 'abc'" unless args.length == 2
+      classes = args.keys.map do |type|
+        name = type.to_s.camelize.to_sym
+        Models.const_get(name).tap { |k| raise "#{type} isn't a valid record type. Use singular snake-case, e.g. :product" unless k < Model::Record }
+      end
+      relation_class = Model::Relation.for!(*classes)
+      relation_class.with_deleted.find_by_origin_ids(args.merge shop: self).first
+    end
+
   end
 end
 

data/lib/netfira/web_connect/version.rb

@@ -1,6 +1,6 @@
 module Netfira
   module WebConnect
-    VERSION = '0.4.0'
+    VERSION = '0.4.2'
     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.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Neil E. Pearson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord