ampere 1.1.1 → 1.2.0

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Changelog
+
+## 1.2.0
+
+* Ampere model IDs are now integers. They are still stored internally the
+  same way as before, so a model named Post will have IDs like "post.3892".
+* Rails integration is now complete!
+  + Add Ampere to your Gemfile.
+  + Type `rails generate ampere:config` to generate an example config file.
+  + Type `rake ampere:flush` to flush Redis (this will delete everything).
+* Callbacks!
+  + `before_save`
+  + `before_create`
+  + More to come.
+* Better test coverage.

data/Gemfile

@@ -3,8 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem 'activesupport'
-gem 'activemodel'
+gem 'activerecord'
 gem 'redis'
 
 # Add dependencies to develop your gem here.
@@ -17,4 +16,5 @@ group :development do
   gem 'simplecov', :require => false, :group => :test
   gem "rspec"
   gem "rdoc"
+  gem "timecop"
 end

data/Gemfile.lock

@@ -1,21 +1,26 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.3)
-      activesupport (= 3.2.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activesupport (3.2.3)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    arel (3.0.2)
     builder (3.0.0)
-    cucumber (1.1.3)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.7)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
-    gherkin (2.6.8)
+    gherkin (2.11.0)
       json (>= 1.4.6)
     git (1.2.5)
     i18n (0.6.0)
@@ -23,33 +28,37 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
-    multi_json (1.0.4)
+    json (1.7.3)
+    multi_json (1.3.6)
     rake (0.9.2.2)
-    rdoc (3.11)
+    rdoc (3.12)
       json (~> 1.4)
-    redis (2.2.2)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    shoulda (2.11.3)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
+    redis (3.0.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    term-ansicolor (1.0.7)
+    timecop (0.3.5)
+    tzinfo (0.3.33)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel
-  activesupport
+  activerecord
   bundler (>= 1.0.0)
   cucumber
   jeweler (~> 1.6.4)
@@ -58,3 +67,4 @@ DEPENDENCIES
   rspec
   shoulda
   simplecov
+  timecop

data/README.md

@@ -2,20 +2,23 @@
 
 Ampere is an ActiveRecord-style ORM for the Redis key/value data store. 
 
-## A note about Ampere version >1.0 (IMPORTANT!!!)
+## Usage
 
-For the 1.0 release I changed Ampere's API so that instead of subclassing
-`Ampere::Model` to use Ampere's methods, you include it as a mixin. This
-change has been reflected in the examples below.
+Add it to your Gemfile:
 
-This change was to unify the usage of Ampere a little more with usage of
-Mongoid, and also so that users of Ampere can use their own class hierarchies,
-which at some later date might have significance with how Ampere works.
+    gem 'ampere', '1.2.0'
 
-## Usage
+Generate a config file:
+
+    rails generate ampere:config
+
+Generate a model:
 
-Write a model class and make it inherit from the `Ampere::Model` class.
-These work pretty similarly to how they do in ActiveRecord or Mongoid.
+    rails generate model post title body
+
+Ampere models include the `Ampere::Model` mixin, which gives them much
+of the same kind of functionality you're used to in ActiveRecord or
+Mongoid.
 
     class Car
       include Ampere::Model
@@ -58,7 +61,8 @@ be slower if one of the keys you are searching by isn't indexed).
     post = Post.where(:title => "BREAKING: Kitties Are Awesome").first
 
 Ampere query results implement the `Enumerable` module, so all the Enumerable methods 
-you know and love are there. 
+you know and love are there. These are lazy-evaluative, only making queries to Redis
+when an object is taken out of the collection. Treat them like Arrays, or don't.
 
 ### Indexes
 
@@ -112,6 +116,16 @@ You can now add validations to your Ampere models thanks to the magic of ActiveM
 
 It's that easy!
 
+## A note about Ampere version >1.0 (IMPORTANT!!!)
+
+For the 1.0 release I changed Ampere's API so that instead of subclassing
+`Ampere::Model` to use Ampere's methods, you include it as a mixin. This
+change has been reflected in the examples above.
+
+This change was to unify the usage of Ampere a little more with usage of
+Mongoid, and also so that users of Ampere can use their own class hierarchies,
+which at some later date might have significance with how Ampere works.
+
 ## Contributing to ampere
  
   * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -47,3 +47,13 @@ RDoc::Task.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+namespace :redis do
+  desc "Flush Redis data (warning: will flush EVERYTHING, including non-Ampere stuff)"
+  task :flush do
+    require 'redis'
+    Redis.new.flushall
+    puts "Redis data FLUSHED!"
+  end
+end
+

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/ampere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ampere"
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Max Thom Stahl"]
-  s.date = "2012-05-12"
+  s.date = "2012-06-15"
   s.description = "An ActiveRecord/Mongoid-esque object model for the Redis key/value data store."
   s.email = "max@villainousindustri.es"
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     ".rvmrc",
+    "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -27,18 +28,91 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "ampere.gemspec",
+    "example/.gitignore",
+    "example/.rspec",
+    "example/Gemfile",
+    "example/Gemfile.lock",
+    "example/README",
+    "example/Rakefile",
+    "example/app/assets/images/rails.png",
+    "example/app/assets/javascripts/application.js",
+    "example/app/assets/javascripts/posts.js.coffee",
+    "example/app/assets/stylesheets/application.css",
+    "example/app/assets/stylesheets/posts.css.scss",
+    "example/app/assets/stylesheets/scaffolds.css.scss",
+    "example/app/controllers/application_controller.rb",
+    "example/app/controllers/posts_controller.rb",
+    "example/app/helpers/application_helper.rb",
+    "example/app/helpers/posts_helper.rb",
+    "example/app/mailers/.gitkeep",
+    "example/app/models/.gitkeep",
+    "example/app/models/post.rb",
+    "example/app/views/layouts/application.html.erb",
+    "example/app/views/posts/_form.html.erb",
+    "example/app/views/posts/edit.html.erb",
+    "example/app/views/posts/index.html.erb",
+    "example/app/views/posts/new.html.erb",
+    "example/app/views/posts/show.html.erb",
+    "example/config.ru",
+    "example/config/ampere.yml",
+    "example/config/application.rb",
+    "example/config/boot.rb",
+    "example/config/environment.rb",
+    "example/config/environments/development.rb",
+    "example/config/environments/production.rb",
+    "example/config/environments/test.rb",
+    "example/config/initializers/backtrace_silencers.rb",
+    "example/config/initializers/inflections.rb",
+    "example/config/initializers/mime_types.rb",
+    "example/config/initializers/secret_token.rb",
+    "example/config/initializers/session_store.rb",
+    "example/config/initializers/wrap_parameters.rb",
+    "example/config/locales/en.yml",
+    "example/config/routes.rb",
+    "example/db/seeds.rb",
+    "example/lib/assets/.gitkeep",
+    "example/lib/tasks/.gitkeep",
+    "example/log/.gitkeep",
+    "example/public/404.html",
+    "example/public/422.html",
+    "example/public/500.html",
+    "example/public/favicon.ico",
+    "example/public/index.html",
+    "example/public/robots.txt",
+    "example/script/rails",
+    "example/spec/controllers/posts_controller_spec.rb",
+    "example/spec/helpers/posts_helper_spec.rb",
+    "example/spec/models/post_spec.rb",
+    "example/spec/requests/posts_spec.rb",
+    "example/spec/routing/posts_routing_spec.rb",
+    "example/spec/spec_helper.rb",
+    "example/spec/views/posts/edit.html.erb_spec.rb",
+    "example/spec/views/posts/index.html.erb_spec.rb",
+    "example/spec/views/posts/new.html.erb_spec.rb",
+    "example/spec/views/posts/show.html.erb_spec.rb",
+    "example/vendor/assets/stylesheets/.gitkeep",
+    "example/vendor/plugins/.gitkeep",
     "features/ampere.feature",
     "features/step_definitions/ampere_steps.rb",
     "features/support/env.rb",
     "lib/ampere.rb",
     "lib/ampere/collection.rb",
+    "lib/ampere/keys.rb",
     "lib/ampere/model.rb",
+    "lib/ampere/timestamps.rb",
+    "lib/rails/generators/ampere/config/config_generator.rb",
+    "lib/rails/generators/ampere/config/templates/ampere.yml",
+    "lib/rails/generators/ampere/model/model_generator.rb",
+    "lib/rails/generators/ampere/model/templates/model.rb.tt",
+    "lib/rails/railtie.rb",
+    "lib/rails/tasks/ampere.rake",
     "spec/models/indices_spec.rb",
     "spec/models/model_spec.rb",
     "spec/models/queries_spec.rb",
     "spec/models/relationships/belongs_to_spec.rb",
     "spec/models/relationships/has_many_spec.rb",
     "spec/models/relationships/has_one_spec.rb",
+    "spec/models/timestamps_spec.rb",
     "spec/models/updates_spec.rb",
     "spec/models/validations_spec.rb",
     "spec/module/ampere_spec.rb",
@@ -51,15 +125,14 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/mstahl/ampere"
   s.licenses = ["EPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.24"
   s.summary = "A pure Ruby ORM for Redis."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<activemodel>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
       s.add_runtime_dependency(%q<redis>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
@@ -68,9 +141,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<timecop>, [">= 0"])
     else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<activemodel>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
       s.add_dependency(%q<redis>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
@@ -79,10 +152,10 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<timecop>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<activemodel>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
     s.add_dependency(%q<redis>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
@@ -91,6 +164,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<timecop>, [">= 0"])
   end
 end
 

data/example/.gitignore

@@ -0,0 +1,5 @@
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/
+.sass-cache/

data/example/.rspec

@@ -0,0 +1 @@
+--colour

data/example/Gemfile

@@ -0,0 +1,21 @@
+source 'http://rubygems.org'
+
+gem 'ampere'
+gem 'haml'
+gem 'jquery-rails'
+gem 'rails', '3.1.1'
+gem 'unicorn'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.1.4'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
+end
+
+group :development do
+  gem 'rspec'
+  gem 'rspec-rails'
+end
+

data/example/Gemfile.lock

@@ -0,0 +1,143 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
+      mail (~> 2.3.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      i18n (~> 0.6)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.1)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
+      multi_json (~> 1.0)
+    ampere (1.2.0)
+      activemodel
+      activesupport
+      redis
+    arel (2.2.3)
+    builder (3.0.0)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.3.3)
+    diff-lcs (1.1.3)
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    haml (3.1.6)
+    hike (1.2.1)
+    i18n (0.6.0)
+    jquery-rails (1.0.19)
+      railties (~> 3.0)
+      thor (~> 0.14)
+    json (1.7.3)
+    kgio (2.7.4)
+    mail (2.3.3)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.18)
+    multi_json (1.3.6)
+    polyglot (0.3.3)
+    rack (1.3.6)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
+      bundler (~> 1.0)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.6)
+    raindrops (0.9.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    redis (3.0.1)
+    rspec (2.10.0)
+      rspec-core (~> 2.10.0)
+      rspec-expectations (~> 2.10.0)
+      rspec-mocks (~> 2.10.0)
+    rspec-core (2.10.1)
+    rspec-expectations (2.10.0)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.10.1)
+    rspec-rails (2.10.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.10.0)
+    sass (3.1.19)
+    sass-rails (3.1.6)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3.2)
+    sprockets (2.0.4)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    thor (0.14.6)
+    tilt (1.3.3)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.33)
+    uglifier (1.2.4)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
+    unicorn (4.3.1)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ampere
+  coffee-rails (~> 3.1.1)
+  haml
+  jquery-rails
+  rails (= 3.1.1)
+  rspec
+  rspec-rails
+  sass-rails (~> 3.1.4)
+  uglifier (>= 1.0.3)
+  unicorn