active_record_content_blob 0.1.4 → 0.1.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDdhNzkzYWRkMTk2YmM1MjFmZTBlNzE1NTYzNzgxZDMzZjhhNTM4ZQ==
+    ZjdmMjg5N2E0ZTA1ZDAzZWUxYTFhM2YxZTUzNjgzZjRlNjdlNWFiNA==
   data.tar.gz: !binary |-
-    ZmIxY2U3MzI0MjMxNzdhNzhhNWMxODA0NTFmOTc0MDljMjA4M2FmZA==
+    NzA3YmRmMDQ1YWVlZjhlNDkwMGRlZTk1ZDE3MDlhZDE2OWUxMjk5Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWQ5ODRmMWJkOTFkMTQ1YzEzNjRiYTk4ZGUwNTVmODM0YWQ0ZDI4ZmI0YjM3
-    NWE2Yjc2NDFhNDI0ZWMwYzdiMmE4M2E0ODcyOTY1MTVjNDJmNjAzNTBhYzg0
-    Y2NhZDljMWYzMWVhOGU2MjU2YjBiMjkyNWQ0NmNkNjc2MzhhZDg=
+    MjgwNTcwZDZhOGY4NzcxODY5NTAyZjk2MTRlN2ZiMjg2MWQ4MGY5MTRlZGUx
+    NjNkYjVjN2VmMGExMTc4OGQ5MDA3NGJjMDRjOTgyOGNiZTc4YzkyOWE5ZmU2
+    MTMzNzYwOTM5ZjE5YWIxMjc1MDM4ZGZlMjBhNmMxNGM5NThkOTQ=
   data.tar.gz: !binary |-
-    ZjA5NzkxMmUyZGFiN2M3ODkwNDAwZTlmZDA1ZmJjMjkyYWM0MDYzZmRlYmU2
-    OWYxMjUxNDRhZTU2YjEwMzE0Zjc4N2JkZjFmZjFkNTVkYzY0MmQxYWE3Zjkx
-    MWM2MDU4MTY4ZTRmMGUwMjc3NzhhNjQ2ZDQ4YjlkYWM5Y2E1YWI=
+    ZGYyYjFlYTZhNjg0NTA3MjQwMjcyNzBjMjFkZDUwYWFkNGU2NzAyMWUwNzRm
+    MDVlYWM4MGM5ZWEwNjg2MmUxYzAxN2ZiMTQzOGJjMGYxMDNlOTRkNWY0ODcx
+    NGJmMzNiN2UxMzgwNTA3NmY0YmM0MmMyODgxYTg5ZjRjNTJjNTE=

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/active_record_content_blob.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "active_record_content_blob"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Nguyen"]

data/lib/content_blob/blobable.rb

@@ -22,31 +22,44 @@ module ActiveRecordContentBlob
 
     module ClassMethods 
 
+
+
       # returns a new record with an attached blob
-      def build_with_blob(hsh, blob_content=nil)
+      # e.g. Record.build_with_a_blob(record_hsh, record_big_hsh)
+      def build_with_a_blob(hsh, blob_content=nil)
         hsh_syms = hsh.symbolize_keys
-        # delete a possible :content_blob so that we can initialize
-        #   the record
-        
+
+        # exclude :contents from instantiating a new Record
         record = self.new(hsh_syms.reject{|k,v| k == :contents})
 
-        if blob_content.nil?
-          # then build a blob only if hsh_syms has :content_blob key
-          if hsh_syms.key?(:contents)
-            blob_content = hsh_syms[:contents]
-            record.build_a_blob(blob_content)
-          end
+        stuff = if blob_content.present?
+          # build a blob using :blob_content
+          blob_content
+        elsif c = hsh_syms[:contents]
+          c
         else
-          # second argument is for the blo
-          record.build_a_blob(blob_content)
+          # then build a blob from the hsh
+          hsh
         end
 
+
+        prepared_stuff = prepare_content_for_blob(stuff)
+
+        record.build_a_blob(prepared_stuff)
         return record
       end
 
-      def create_with_blob(hsh, blob_content=nil)
-        build_with_blob(hsh, blob_content).save
+
+
+      def create_with_a_blob(hsh, blob_content=nil)
+        build_with_a_blob(hsh, blob_content).save
+      end
+
+      # allow this to be redefined
+      def prepare_content_for_blob(some_content)
+        some_content
       end
+      
     end # classmethods
 
     ## instance methods    
@@ -54,6 +67,7 @@ module ActiveRecordContentBlob
       self.build_content_blob(contents: some_content)
     end
 
+  
 
     def has_blob?
       content_blob.exists?

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'rspec'
 require 'active_record'
 require 'database_cleaner'
 require 'sqlite3'
+require 'pry'
 
 require 'active_record_content_blob'
 

data/spec/unit/blobable_spec.rb

@@ -46,30 +46,58 @@ describe "Blobable" do
     end
   end
 
-  describe 'class convenience method ::build_with_blob' do 
+  describe 'class convenience method ::build_with_a_blob' do 
     context 'one argument' do 
       it 'should build associated content_blob with Hash :contents' do 
-        @record = MusicRecord.build_with_blob({name: 'X', contents: [1]})
+        @record = MusicRecord.build_with_a_blob({name: 'X', contents: [1]})
         expect(@record.contents).to eq [1]
       end
 
-      it 'should build no content_blob without :contents' do 
-        @record = MusicRecord.build_with_blob(name: 'X')
-        expect(@record.contents).to be_nil
+      it 'should build a content_blob, eq to first Hash, even without :contents' do 
+        @record = MusicRecord.build_with_a_blob(name: 'X')
+        expect(@record.contents).to eq( {name: 'X'})
       end
     end
 
     context 'second argument' do 
       it 'should use second argument as :contents for built blob' do 
-        @record = MusicRecord.build_with_blob({name: 'A'}, [99])
+        @record = MusicRecord.build_with_a_blob({name: 'A'}, [99])
         expect(@record.contents).to eq [99]
       end
     end
   end
 
+
+  context 'allow .prepare_content_blob hook to be redefined' do 
+    before(:each) do 
+      class MusicRecord < ActiveRecord::Base
+        def self.prepare_content_for_blob(some_content)
+          some_content.is_a?(Hash) ? [some_content] : Array(some_content)
+        end
+      end
+ 
+      MusicRecord
+    end
+
+    after(:each) do 
+      class MusicRecord < ActiveRecord::Base
+        def self.prepare_content_for_blob(some_content)
+          some_content
+        end
+      end      
+    end
+
+    it 'should redefine .prepare_content_blob as specified' do
+      @record = MusicRecord.build_with_a_blob({name: 'A'})
+      expect(@record.contents).to eq [{name: 'A'}]
+    end
+
+
+  end
+
   context 'scopes' do 
     before(:each) do 
-      @r1 = MusicRecord.create_with_blob(name: 'A', contents: ['Z'])
+      @r1 = MusicRecord.create_with_a_blob(name: 'A', contents: ['Z'])
       @r2 = MusicRecord.create(name: 'qqq')
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_content_blob
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Dan Nguyen