redis_storage 0.2.9 → 0.3.0

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p125

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - rbx-18mode
+  - rbx-19mode
+notifications:
+  email:
+    - dev@eger.lc

data/Gemfile

@@ -3,11 +3,8 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in redis_record.gemspec
 gemspec
 
-group :development do
-  # irb stuff
-  gem 'wirble'
-  gem 'hirb'
-  gem 'awesome_print'
-  gem 'bond'
-  gem 'sketches'
+group :development, :test do
+  gem 'guard-rspec'
+  gem 'pry'
+  gem 'pry-nav'
 end

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+

data/lib/generators/templates/model.rb

@@ -1,6 +1,3 @@
 class <%= class_name %> < RedisStorage::Model
-  def self.attrs
-    [ :id<%=", :" unless attrs.empty?%><%= attrs.map{|e| e.split(':')[0]}.join(', :') %> ]
-  end
-  attr_accessor *attrs
+  attribute <%= ':' unless attrs.empty? %><%= attrs.map{|e| e.split(':')[0]}.join(', :') %>
 end

data/lib/redis_storage/version.rb

@@ -1,3 +1,3 @@
 module RedisStorage
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/lib/redis_storage.rb

@@ -8,25 +8,35 @@ module RedisStorage
     include ActiveModel::Validations
     include ActiveModel::Conversion
     extend ActiveModel::Naming
-
     validates_presence_of :id
-
-    def self.attrs
-      []
-    end
-
-    attr_accessor *attrs
     attr_accessor :id
     attr_reader :errors
 
-    def self.index_for
-      []
+    @@_attributes = Hash.new { |hash, key| hash[key] = [] }
+    @@_indizies = Hash.new { |hash, key| hash[key] = [] }
+
+    def self.attribute *attr
+      attr.each do |name|
+        define_method(name) do
+          @_attributes[name]
+        end
+        define_method(:"#{name}=") do |v|
+          @_attributes[name] = v
+        end
+        attributes << name unless attributes.include? name
+      end
     end
-    def self.build(params)
+    def self.index *attr
+      attr.each do |name|
+        indizies << name unless indizies.include? name
+      end
+    end
+
+    def self.build params
       new params
     end
 
-    def self.create(params)
+    def self.create params
       obj = build params
       obj.save
       obj
@@ -46,7 +56,7 @@ module RedisStorage
     def self.find_by(key, value)
       if key == :id
         load "#{db_key}:#{value}"
-      elsif index_for.include? key
+      elsif indizies.include? key
         load($db.get("#{db_key}:#{key}:#{value.hash}"))
       else
         nil
@@ -75,7 +85,7 @@ module RedisStorage
       load $db.smembers(persisted_key).sort_by{|s| s.split(':')[1].to_i}.last
     end
     def serializable_hash
-      self.class.attrs.inject({:id => @id}) do |a,key|
+      attributes.inject({:id => @id}) do |a,key|
         a[key] = send(key)
         a
       end
@@ -99,7 +109,7 @@ module RedisStorage
         $db.multi do
           $db.set db_key, to_json
           $db.sadd self.class.persisted_key, db_key
-          for key in self.class.index_for do
+          indizies.each do |key|
             $db.set "#{self.class.db_key}:#{key}:#{send(key).hash}", db_key
           end
         end
@@ -117,7 +127,7 @@ module RedisStorage
         $db.multi do
           $db.del db_key
           $db.srem self.class.persisted_key, db_key
-          for key in self.class.index_for do
+          indizies.each do |key|
             $db.del "#{self.class.db_key}:#{key}:#{send(key).hash}"
           end
         end
@@ -146,6 +156,8 @@ module RedisStorage
     end
 
     def initialize(params={})
+      @_attributes = {}
+      @_indizies = {}
       @id = nil
       @errors = ActiveModel::Errors.new(self)
       params.each do |key, value|
@@ -161,5 +173,18 @@ module RedisStorage
     def self.next_id_key
       "#{db_key}:next_id"
     end
+    def self.attributes
+      @@_attributes[self]
+    end
+    def self.indizies
+      @@_indizies[self]
+    end
+    def attributes
+      self.class.attributes
+    end
+    def indizies
+      self.class.indizies
+    end
+
   end
 end

data/{README → readme.md}

@@ -6,6 +6,8 @@ This is a little gem which provides a redis interface for models. It works out o
 Basically I just got sick rewriting the same logic over and over again for each model of my little sinatra apps so this evolved. Then I wanted to write a new rails app an thought having this in a gem would be really nice, and a generator would be awesome.
 Now I will add new Feature as I need them. You also can let me know what to add.
 
+[![Build Status](https://secure.travis-ci.org/sch1zo/redis_storage.png)](http://travis-ci.org/sch1zo/redis_storage)
+
 Features
 ---
 
@@ -63,20 +65,14 @@ create a model which inherit from RedisStorage::Model
 
 and define the models attributes via self.attrs, additional to the defined attributes there will always be an attribute id
 
-    def self.attrs
-      [:body, :title]
-    end
-    attr_accessor *attrs
+    attribute :body, :title
 
 Minimal Example
 ---
 
     require 'redis_storage'
     class MyModel < RedisStorage::Model
-      def self.attrs
-        [:body, :title]
-      end
-      attr_accessor *attrs
+      attribute :body, :title
     end
 
 Indexing and find_by
@@ -84,9 +80,7 @@ Indexing and find_by
 
 If you want or need to find records based on a attribute you have to add it to the index_for array like this.
 
-    def self.index_for
-      [:some, :attributes, :to, :index]
-    end
+    index :some, :attributes, :to, :index
 
 The elements should be symbols and have to also be element of attrs.
 After that you can use the following to get the the instance.
@@ -115,15 +109,10 @@ or
 meta
 ---
 
-Tested with RSpec and testunit for the generator for
-* ree-1.8.7-2011.03
-* MRI 1.9.2
-* rbx
-* rbx-2.0.0pre
-
-Inspired by
+Tested with RSpec via [travis-ci](http://travis-ci.org/sch1zo/redis_storage) for
 
-* some ideas from the redis backend in [scanty-redis](https://github.com/adamwiggins/scanty-redis)
-* various small sinatra projects from myself which use a pre version of this gem
+* ree
+* MRI 1.9.{2,3}
+* rbx-{18,19}mode
 
 sch1zo

data/redis_storage.gemspec

@@ -16,9 +16,11 @@ Gem::Specification.new do |s|
   s.add_dependency 'json'
   s.add_dependency 'activemodel', '>= 3.0.0'
 
-  s.add_development_dependency 'rspec', '>= 2.0.0'
-  s.add_development_dependency 'mocha', '>= 0.9.10'
-  s.add_development_dependency 'rails', '>= 3.0.0'
+  s.add_development_dependency 'rspec', '>= 2.8.0'
+  s.add_development_dependency 'mocha', '>= 0.10.4'
+  s.add_development_dependency 'mock_redis', '>= 0.3.0'
+  s.add_development_dependency 'generator_spec', '>= 0.8.5'
+  s.add_development_dependency 'rails', '>= 3.2.0'
 
   s.rubyforge_project = "redis_storage"
 

data/spec/generator_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'rails/all'
+require './lib/generators/rails/redis_generator'
+require "generator_spec/test_case"
+
+describe ::Rails::Generators::RedisGenerator do
+  include GeneratorSpec::TestCase
+  destination File.expand_path "../../tmp", __FILE__
+  arguments %w(Schedule title body created_at)
+  before(:all) do
+    prepare_destination
+    run_generator
+  end
+  specify "model" do
+    destination_root.should have_structure {
+      directory 'app' do
+        directory 'models' do
+          file 'schedule.rb' do
+            contains "class Schedule < RedisStorage::Model"
+            contains "attribute :title, :body, :created_at"
+          end
+        end
+      end
+    }
+  end
+end

data/spec/model_spec.rb

@@ -1,12 +1,7 @@
 require 'spec_helper'
 class MockModel < RedisStorage::Model
-  def self.attrs
-    [:body, :title]
-  end
-  attr_accessor *attrs
-  def self.index_for
-    [:title]
-  end
+  attribute :body, :title
+  index :title
 end
 
 describe RedisStorage::Model do
@@ -99,7 +94,7 @@ describe RedisStorage::Model do
       end
       context '#all' do
         it 'should return an empty array if there are no entries' do
-          Redis.any_instance.stubs(:smembers => [])
+          MockRedis.any_instance.stubs(:smembers => [])
           records = MockModel.all
           records.should eq([])
         end

data/spec/spec_helper.rb

@@ -1,17 +1,19 @@
 require 'rubygems'
-require 'bundler/setup'
+require 'bundler'
+
+Bundler.setup
+Bundler.require(:default, :test)
 
 require './lib/redis_storage' # and any other gems you need
-require 'redis'
+require 'mock_redis'
 
 RSpec.configure do |config|
   config.mock_with :mocha
   config.before(:all) do
-    $db = Redis.new({})
+    $db = MockRedis.new
   end
   config.before(:each) do
-    $db.select 12
-    $db.flushdb
+    $db.flushall
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_storage
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-03 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &11725760 !ruby/object:Gem::Requirement
+  requirement: &108020580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *11725760
+  version_requirements: *108020580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &11725340 !ruby/object:Gem::Requirement
+  requirement: &108036480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11725340
+  version_requirements: *108036480
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &11724800 !ruby/object:Gem::Requirement
+  requirement: &108032540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,40 +43,62 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *11724800
+  version_requirements: *108032540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11724300 !ruby/object:Gem::Requirement
+  requirement: &108088580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *11724300
+  version_requirements: *108088580
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &11723840 !ruby/object:Gem::Requirement
+  requirement: &108087020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.10
+        version: 0.10.4
   type: :development
   prerelease: false
-  version_requirements: *11723840
+  version_requirements: *108087020
+- !ruby/object:Gem::Dependency
+  name: mock_redis
+  requirement: &108086340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *108086340
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: &108085660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.5
+  type: :development
+  prerelease: false
+  version_requirements: *108085660
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &11723380 !ruby/object:Gem::Requirement
+  requirement: &108084680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :development
   prerelease: false
-  version_requirements: *11723380
+  version_requirements: *108084680
 description: Provides a data backend for a Redis in Rails, will also provide a Rails
   3 Generator
 email:
@@ -87,10 +108,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rbenv-version
 - .rspec
-- .rvmrc
+- .travis.yml
 - Gemfile
-- README
+- Guardfile
 - Rakefile
 - lib/generators/rails/redis_generator.rb
 - lib/generators/templates/model.rb
@@ -98,11 +120,11 @@ files:
 - lib/redis_storage/railtie.rb
 - lib/redis_storage/version.rb
 - lib/tasks/redis_storage.rake
+- readme.md
 - redis_storage.gemspec
+- spec/generator_spec.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
-- test/generator_test.rb
-has_rdoc: true
 homepage: https://github.com/sch1zo/redis_storage
 licenses: []
 post_install_message: 
@@ -115,16 +137,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3658108810072488555
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3658108810072488555
 requirements: []
 rubyforge_project: redis_storage
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A simple Redis ORM for Rails
-test_files: []
+test_files:
+- spec/generator_spec.rb
+- spec/model_spec.rb
+- spec/spec_helper.rb

data/.rvmrc

@@ -1,10 +0,0 @@
-#rvm use rbx-2.0.0pre@redisrecord --create
-#export RBXOPT=-Xrbc.db=$HOME/.rbx
-rvm use 1.9.2@redisrecord --create
-
-#install bundler if its not already
-if ! command -v bundle ; then
-  gem install bundler
-fi
-# Bundle while reducing excess noise.
-bundle | grep -v 'Using' | grep -v 'complete' | sed '/^$/d'

data/test/generator_test.rb

@@ -1,35 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-
-require 'bundler'
-Bundler.setup
-
-require './lib/generators/rails/redis_generator'
-
-class RedisGeneratorTest < Rails::Generators::TestCase
-  destination File.expand_path("../tmp", File.dirname(__FILE__))
-  setup :prepare_destination
-  tests ::Rails::Generators::RedisGenerator
-
-  test 'should create a model file with a few basic lines' do
-    run_generator %w(Schedule title body created_at)
-    assert_file 'app/models/schedule.rb', /class Schedule < RedisStorage::Model/
-    assert_file 'app/models/schedule.rb', /attr_accessor \*attrs/
-  end
-  test 'should set the classes attrs' do
-    run_generator %w(Schedule title body created_at)
-    assert_file 'app/models/schedule.rb' do |model|
-      assert_class_method :attrs, model do |attrs|
-        assert_match /[ :id, :title, :body, :created_at ]/, attrs
-      end
-    end
-  end
-  test 'should set id as only class attribute if none given' do
-    run_generator %w(Schedule title body)
-    assert_file 'app/models/schedule.rb' do |model|
-      assert_class_method :attrs, model do |attrs|
-        assert_match /[ :title, :body ]/, attrs
-      end
-    end
-  end
-end