sqlcached_client 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f725ac30395fee0332b228f2f7afba9a8e3f63
-  data.tar.gz: 6c8f3618babaf1f18b1295d75bb86a89c84007ca
+  metadata.gz: c52edd2d96831a9e05941a287443c347dca26549
+  data.tar.gz: 7894d5099b83c363f9f462f8cf1ce6b5cfb9d3ec
 SHA512:
-  metadata.gz: e7759cc739a2e3d14bc63c294b84cc1096ed7c97f877e4e86210d3e792bfc61e95cab515b7a7a0362e87aaab382cad539305e5caf0eaf0beacdd8aeb860a848b
-  data.tar.gz: 26d535fd6114978514c5b726755bdfd69a30458955a31259ccfc4f86d6baf7dc1dde767f501e392c91cad7e7ffb62077f03e6eaba14e9705fb7998bb2bce9915
+  metadata.gz: 712a6ea0b897d0458db5c70bed329e2a03bf37469341fb9bc9bb3fc4c7f7fcd2b0c49f1cb4dd865eb31061767cebc8920f4056b049c37d7ca1b8fab37b47af8a
+  data.tar.gz: b8eb923e7b4a37f7ef28e620b60a5484bba080fcd94e8187bf895c5302d6cfd4050d7b4aee5430c640b125327f5b62a600dc212281c17c1159f3186f2cb3fd9f

data/lib/sqlcached_client/attachment.rb

@@ -17,7 +17,7 @@ module SqlcachedClient
 
     class << self
 
-      attr_reader :variables
+      attr_reader :variables, :entity_class
 
       def add_variable(variable_name, predicate)
         raise "Invalid predicate" if !PREDICATES.include?(predicate)
@@ -32,9 +32,17 @@ module SqlcachedClient
       self.class.variables
     end
 
+    def entity_class
+      self.class.entity_class
+    end
+
+    def entity_namespace
+      entity_class.try(:entity_namespace)
+    end
+
     def to_query_format
       {
-        name: name,
+        name: external_name,
         condition_values: Hash[
           variables.map { |v| [v.name, conditions[v.name]] }
         ]
@@ -43,12 +51,23 @@ module SqlcachedClient
 
     def to_save_format
       {
-        name: name,
+        name: external_name,
         attachment: content,
         conditions: variables.map do |v|
           "#{v.name} #{v.predicate} #{conditions[v.name]}"
         end
       }
     end
+
+  private
+
+    def external_name
+      @external_name ||=
+        if prefix = entity_namespace.presence
+          "#{entity_namespace}::#{name}"
+        else
+          name
+        end
+    end
   end
 end

data/lib/sqlcached_client/attachments.rb

@@ -6,11 +6,14 @@ module SqlcachedClient
     module ClassMethods
 
       def has_attachment(name, &block)
+        entity_class = self
         @attachment_classes ||= {}
         @attachment_classes[name] =
           Class.new(Attachment) do
 
             @attachment_name = name
+            @entity_class = entity_class
+
             class << self
               attr_reader :attachment_name
             end

data/lib/sqlcached_client/version.rb

@@ -1,3 +1,3 @@
 module SqlcachedClient
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/sqlcached_client/attachment_spec.rb

@@ -65,4 +65,31 @@ describe SqlcachedClient::Attachment do
       end
     end
   end
+
+  describe :entity_class do
+    it "is class.entity_class" do
+      attachment = described_class.new(nil, {}, nil)
+      allow(described_class).to receive(:entity_class).and_return('foo')
+      expect(attachment.entity_class).to eq('foo')
+    end
+  end
+
+  describe :entity_namespace do
+    context "when entity_class is nil" do
+      it "is nil" do
+        attachment = described_class.new(nil, {}, nil)
+        allow(attachment).to receive(:entity_class).and_return(nil)
+        expect(attachment.entity_namespace).to be_nil
+      end
+    end
+
+    context "when entity_class is not nil" do
+      it "is entity_class.entity_namespace" do
+        attachment = described_class.new(nil, {}, nil)
+        allow(attachment).to receive(:entity_class).and_return(
+          double(entity_namespace: 'foo'))
+        expect(attachment.entity_namespace).to eq('foo')
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqlcached_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Roberto Maestroni