extraloop-redis-storage 0.0.11 → 0.0.12

data/History.txt

@@ -1,5 +1,8 @@
+== 0.0.12 / 2012-03-08
+  * more improvements to ExtraLoop::Storage::IdKey
+
 == 0.0.11 / 2012-03-08
-  * Improved Ohm::Storage::IdKey module
+  * Improved ExtraLoop::Storage::IdKey module
 
 == 0.0.10 / 2012-03-06
   * Implemented non-numeric record ids for ExtraLoop::Storage::Record

data/lib/extraloop/redis-storage.rb

@@ -33,7 +33,7 @@ require "support"
 
 module ExtraLoop
   module Storage
-    VERSION ||= "0.0.11"
+    VERSION ||= "0.0.12"
 
     def self.connect(*args)
       Ohm.connect(*args)

data/lib/extraloop/redis-storage/id_key.rb

@@ -44,8 +44,10 @@ module ExtraLoop::Storage::IdKey
   # Raises an 'ArgumentError' if the provided id string does not match the ID_FORMAT (e.g. if it contains non-alphanumeric characters').
   #
   def [](id, attributes={})
+    # automatically strip prefix from id
+    id = id.to_s.gsub(prefix + KEY_SEPARATOR, '')
     raise ArgumentError.new "Invalid id '#{id}'" unless id =~ ID_FORMAT
-    id = prefix(id.to_s, attributes)
+    id = [prefix, id].reject(&:empty?).join(KEY_SEPARATOR)
 
     if record = super(id)
       record.update(attributes) if attributes.any?
@@ -60,7 +62,6 @@ module ExtraLoop::Storage::IdKey
   # While default behviour is to prepend the record's model class name to id string, it is possible to override this method
   # so that the generated record id key will include other attributes (see example below).
   #
-  # id - The record id.
   # attributes - The attributes hash
   #
   # Examples
@@ -74,8 +75,8 @@ module ExtraLoop::Storage::IdKey
   #   extend IdKey
   #   attribute :locale
   #
-  #   def self::prefix(id, attrs={})
-  #     [self.name, attrs.fetch(:locale, 'en'), id]).join(IdKey::KEY_SEPARATOR)
+  #   def self::prefix(attrs={})
+  #     [self.name, attrs.fetch(:locale, 'en')].join(IdKey::KEY_SEPARATOR)
   #   end
   # end
   #
@@ -87,8 +88,8 @@ module ExtraLoop::Storage::IdKey
   # Returns the record id key.
   #
 
-  def prefix(id, attributes={})
-    [self.name, id].join(KEY_SEPARATOR)
+  def prefix(attributes={})
+    self.name
   end
 
 end

data/lib/extraloop/redis-storage/model.rb

@@ -4,21 +4,18 @@
 class ExtraLoop::Storage::Model < Ohm::Model
   extend ExtraLoop::Storage::IdKey
 
-  # Internal: Overrides the default id key handling function and 
-  # replaces it with a validity check.
-  #
-  # id - The record id.
-  # attributes - The record attributes (defaults to an empty array)
-  #
-  #
-  #
-  # Returns the model name
-  # Raises an ArgumentError if the id string is not capitalized
-  #
+  class << self
+    alias_method :'_[]', :[]
 
-  def self.prefix(id, attributes={})
-    raise ArgumentError.new "model Id should be capitalized" unless id.to_s[0] =~ /[A-Z]/
-    id
+    def [](id, attributes={})
+      id = id.to_s.gsub(prefix, '')
+      raise ArgumentError.new "model name must be a constant" unless ('A'..'Z').include?(id[0])
+      send('_[]', id, attributes)
+    end
+
+    def prefix
+      ""
+    end
   end
 
   def to_hash

data/spec/id_key_spec.rb

@@ -32,6 +32,16 @@ describe Entry do
       end
     end
 
+    context "with a generated id as argument" do
+      before do
+        @entry = Entry['fufu']
+      end
+
+      subject { Entry[@entry.id] }
+      it { should eql(@entry) }
+      it { should eql(Entry['fufu'])}
+    end
+
     context "without arguments" do
       before do
         @entry = Entry['foo']

data/spec/model_spec.rb

@@ -9,6 +9,7 @@ describe ExtraLoop::Storage::Model do
     it "should create a record with 'My_model' as an id" do
       @model.id.should eql('My_model')
     end
+    
 
     it "should throw an argument error if the model id is not capitalized" do
       lambda { ExtraLoop::Storage::Model[:my_model] }.should raise_error(ArgumentError)

data/spec/record_spec.rb

@@ -15,6 +15,22 @@ describe ExtraLoop::Storage::Record do
 
   context "record subclasses" do
 
+    describe "#valid?" do
+      subject { @record = MyRecord.new(:foo => 'foo', :bar => 'bar').valid? }
+      it { should be_false }
+    end
+
+    describe "#errors" do
+      before do
+        @record = MyRecord.new(:foo => 'foo', :bar => 'bar')
+        @record.save
+      end
+
+      subject { @record.errors }
+
+      it { should include([:session, :not_present]) }
+    end
+
     describe "#save" do
 
       subject { MyRecord.new(:session => @session, :extracted_at => Time.now).save }
@@ -92,9 +108,4 @@ describe ExtraLoop::Storage::Record do
       end
     end
   end
-
-  after do
-    redis = Ohm.redis
-    redis.keys("[^art]*").each { |key| redis.del(key) }
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: extraloop-redis-storage
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: extraloop
-  requirement: &17492340 !ruby/object:Gem::Requirement
+  requirement: &10546440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *17492340
+  version_requirements: *10546440
 - !ruby/object:Gem::Dependency
   name: ohm
-  requirement: &17491180 !ruby/object:Gem::Requirement
+  requirement: &10545060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *17491180
+  version_requirements: *10545060
 - !ruby/object:Gem::Dependency
   name: ohm-contrib
-  requirement: &17490000 !ruby/object:Gem::Requirement
+  requirement: &10544240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *17490000
+  version_requirements: *10544240
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &17489000 !ruby/object:Gem::Requirement
+  requirement: &10543460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *17489000
+  version_requirements: *10543460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17366960 !ruby/object:Gem::Requirement
+  requirement: &10452020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17366960
+  version_requirements: *10452020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17365700 !ruby/object:Gem::Requirement
+  requirement: &10451300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *17365700
+  version_requirements: *10451300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &17365120 !ruby/object:Gem::Requirement
+  requirement: &10450580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *17365120
+  version_requirements: *10450580
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &17363920 !ruby/object:Gem::Requirement
+  requirement: &10449680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *17363920
+  version_requirements: *10449680
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &17362540 !ruby/object:Gem::Requirement
+  requirement: &10449200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.7.4
   type: :development
   prerelease: false
-  version_requirements: *17362540
+  version_requirements: *10449200
 - !ruby/object:Gem::Dependency
   name: fusion_tables
-  requirement: &17361520 !ruby/object:Gem::Requirement
+  requirement: &10448560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *17361520
+  version_requirements: *10448560
 - !ruby/object:Gem::Dependency
   name: geocoder
-  requirement: &17360980 !ruby/object:Gem::Requirement
+  requirement: &10447960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *17360980
+  version_requirements: *10447960
 description: Redis-based Persistence layer for the ExtraLoop data extraction toolkit.
   Includes a convinent command line tool allowing to list, filter, delete, and export
   harvested datasets
@@ -182,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2994180190336763644
+      hash: -103533273171321117
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: