ambry 0.2.4 → 0.3.0

data/Changelog.md

@@ -1,6 +1,14 @@
 # Ambry Changelog
 
-## [0.2.4](https://github.com/norman/ambry/tree/0.2.3) - 2011-10-07 ([diff](https://github.com/norman/ambry/compare/0.2.3...0.2.4))
+## [0.3.0](https://github.com/norman/ambry/tree/0.3.0) - 2012-03-15 ([diff](https://github.com/norman/ambry/compare/0.2.4...0.3.0))
+
+### [Norman Clarke](https://github.com/norman)
+
+* Don't raise from finds using hash proxy when a key has a falsy value
+* Remove cookie adapter; keep Ambry focused on its core mission.
+* Fixed bug which allowed invalid records to be saved with Active Model. Thanks Tute Costa for reporting.
+
+## [0.2.4](https://github.com/norman/ambry/tree/0.2.4) - 2011-10-07 ([diff](https://github.com/norman/ambry/compare/0.2.3...0.2.4))
 
 ### [Norman Clarke](https://github.com/norman)
 

data/README.md

@@ -6,8 +6,7 @@ library with plain old Ruby objects that are searchable via a fast, simple
 database-like API.
 
 It implements Active Model and has generators to integrate nicely with Rails.
-You can store your data in a file, a signed string suitable for storage in a
-cookie, or easily write your own IO adapter.
+You can store your data in either YAML or dump file.
 
 For more info, take a peek at the
 [docs](http://rubydoc.info/github/ambry/ambry/master/frames), or read on for some

data/extras/countries.rb

@@ -3,8 +3,6 @@
 require "bundler/setup"
 require "ambry"
 
-Ambry::Adapter.new
-
 class Country
   extend Ambry::Model
   field :tld, :name, :population, :region

data/lib/ambry/active_model.rb

@@ -49,6 +49,14 @@ module Ambry
         new(*args).save!
       end
 
+      # Create and save a model instance, returning false if any errors
+      # occur.
+      def create(*args)
+        new(*args).save!
+      rescue AmbryError
+        false
+      end
+
       # Validate the uniqueness of a field's value in a model instance.
       def validates_uniqueness_of(*attr_names)
         validates_with Validations::Uniqueness, _merge_attributes(attr_names)
@@ -88,6 +96,7 @@ module Ambry
       end
 
       def save
+        return false unless valid?
         run_callbacks(:save) do
           @new_record = false
           super
@@ -117,6 +126,10 @@ module Ambry
       def update_attributes(*args)
         run_callbacks(:save) { update(*args) }
       end
+
+      def to_partial_path
+        "#{self.class.name.pluralize.underscore}/#{self.class.name.underscore}"
+      end
     end
   end
 end

data/lib/ambry/hash_proxy.rb

@@ -12,7 +12,13 @@ module Ambry
 
     # Allows accessing a hash attribute as a method.
     def method_missing(symbol)
-      hash[symbol] or hash[symbol.to_s] or raise NoMethodError
+      if hash.key?(symbol)
+        hash[symbol]
+      elsif hash.key?(symbol.to_s)
+        hash[symbol.to_s]
+      else
+        raise NoMethodError
+      end
     end
 
     # Allows accessing a hash attribute as hash key, either a string or symbol.

data/lib/ambry/version.rb

@@ -1,8 +1,8 @@
 module Ambry
   module Version
     MAJOR  = 0
-    MINOR  = 2
-    TINY   = 4
+    MINOR  = 3
+    TINY   = 0
     BUILD  = nil
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

data/spec/active_model_spec.rb

@@ -59,6 +59,24 @@ describe Ambry::ActiveModel do
     end
   end
 
+  describe "#create" do
+    it "should not store invalid model instances" do
+      old_count = Book.count
+      Book.create({})
+      assert_equal old_count, Book.count
+    end
+  end
+
+  describe "#save" do
+    it "should not store invalid model instances" do
+      old_count = Book.count
+      book = Book.new
+      assert !book.valid?
+      book.save
+      assert_equal old_count, Book.count
+    end
+  end
+
   describe "#to_json" do
     it "should serialize" do
       json = @model.to_json
@@ -86,7 +104,9 @@ describe Ambry::ActiveModel do
 
   describe "callbacks" do
     it "should fire save callbacks" do
+      Book.mapper.clear
       book = Book.new valid_book
+      assert book.valid?
       book.save
       assert book.instance_variable_defined? :@save_callback_fired
     end
@@ -112,4 +132,11 @@ describe Ambry::ActiveModel do
       assert @book.valid?
     end
   end
+
+  describe "to_partial_path" do
+    it "should return something reasonable" do
+      assert_equal "books/book", Book.new.to_partial_path
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ambry
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-24 00:00:00.000000000 Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70331994375060 !ruby/object:Gem::Requirement
+  requirement: &70196828901600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331994375060
+  version_requirements: *70196828901600
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70331994374560 !ruby/object:Gem::Requirement
+  requirement: &70196828901100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.2
   type: :development
   prerelease: false
-  version_requirements: *70331994374560
+  version_requirements: *70196828901100
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70331994374100 !ruby/object:Gem::Requirement
+  requirement: &70196828900640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331994374100
+  version_requirements: *70196828900640
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70331994373520 !ruby/object:Gem::Requirement
+  requirement: &70196828900020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70331994373520
+  version_requirements: *70196828900020
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70331994373020 !ruby/object:Gem::Requirement
+  requirement: &70196828915860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70331994373020
+  version_requirements: *70196828915860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70331994372560 !ruby/object:Gem::Requirement
+  requirement: &70196828915480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331994372560
+  version_requirements: *70196828915480
 description: ! "    Ambry is not an ORM, man! It's a database and ORM replacement
   for (mostly)\n    static models and small datasets. It provides ActiveModel compatibility,
   and\n    flexible searching and storage.\n"
@@ -93,13 +93,11 @@ files:
 - Rakefile
 - ambry.gemspec
 - extras/bench.rb
-- extras/cookie_demo.rb
 - extras/countries.rb
 - lib/ambry.rb
 - lib/ambry/abstract_key_set.rb
 - lib/ambry/active_model.rb
 - lib/ambry/adapter.rb
-- lib/ambry/adapters/cookie.rb
 - lib/ambry/adapters/file.rb
 - lib/ambry/adapters/yaml.rb
 - lib/ambry/hash_proxy.rb
@@ -107,10 +105,8 @@ files:
 - lib/ambry/model.rb
 - lib/ambry/version.rb
 - lib/generators/ambry_generator.rb
-- lib/rack/ambry.rb
 - spec/active_model_spec.rb
 - spec/adapter_spec.rb
-- spec/cookie_adapter_spec.rb
 - spec/file_adapter_spec.rb
 - spec/fixtures.yml
 - spec/key_set_spec.rb
@@ -137,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ! '[none]'
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: An ActiveModel-compatible ORM-like library for storing model instances in

data/extras/cookie_demo.rb

@@ -1,111 +0,0 @@
-$LOAD_PATH << File.expand_path("../../lib", __FILE__)
-$LOAD_PATH.uniq!
-
-require "rubygems"
-require "sinatra"
-require "haml"
-require "babosa"
-require "date"
-require "ambry"
-require "ambry/adapters/cookie"
-require "rack/ambry"
-
-set :session, false
-
-use Rack::Cookies
-use Rack::Ambry, :name => :cookie, :secret => "Sssshhhh! This is a secret."
-
-class Book
-  extend Ambry::Model
-  field :slug, :title, :author
-  use :cookie
-
-  def title=(value)
-    @slug  = value.to_slug.normalize.to_s
-    @title = value
-  end
-end
-
-get "/" do
-  @header = "Books"
-  @books  = Book.all
-  haml :index
-end
-
-get "/books/new" do
-  @header = "Add a Book"
-  @action = "/books"
-  haml :new
-end
-
-get "/books/:slug/edit" do |slug|
-  @book           = Book.get(slug)
-  @action         = "/books"
-  @header         = @book.title
-  params[:title]  = @book.title
-  params[:author] = @book.author
-  haml :edit
-end
-
-get "/books/:slug" do |slug|
-  @book   = Book.get(slug)
-  @header = @book.title
-  haml :book
-end
-
-post "/books" do
-  Book.delete params[:slug] if params[:slug]
-  @book = Book.create params if params[:title]
-  redirect "/"
-end
-
-__END__
-@@layout
-!!! 5
-%html
-  %head
-    %meta(http-equiv="Content-Type" content="text/html; charset=utf-8")
-    %title Ambry Cookie Adapter Demo
-  %body
-    %h2= @header
-    = yield
-
-@@edit
-= haml(:form, :layout => false)
-
-@@index
-%ul
-  - @books.each do |book|
-    %li= '<a href="/books/%s">%s</a>' % [book.slug, book.title, book.author]
-%p.controls
-  <a href="/books/new">New book</a>
-
-@@new
-= haml(:form, :layout => false)
-%p.controls
-  <a href="/">Books</a>
-
-@@book
-by #{@book.author}
-%p.controls
-  <a href="/">Books</a>
-  <a href="/books/#{@book.slug}/edit">Edit</a>
-
-@@form
-%form(method="post" enctype="utf-8" action=@action)
-  %p
-    - if @book
-      %input#slug{:type => "hidden", :value => @book.slug, :name => "slug"}
-    %label(for="title") Title:
-    %br
-    %input#title{:type => "text", :value => params[:title], :name => "title"}
-  %p
-    %label(for="author") Author:
-    %br
-    %input#author{:type => "text", :value => params[:author], :name => "author"}
-  %p
-    %input(type="submit" value="save it")
-- if @book
-  %form{:method => "post", :enctype => "utf-8", :action => "/books"}
-    %input#slug{:type => "hidden", :value => @book.slug, :name => "slug"}
-    %input(type="submit" value="or delete it")

data/lib/ambry/adapters/cookie.rb

@@ -1,55 +0,0 @@
-require "active_support"
-require "active_support/message_verifier"
-require "zlib"
-
-module Ambry
-  module Adapters
-
-    # Ambry's cookie adapter allows you to store a Ambry database inside
-    # a zipped and signed string suitable for setting as a cookie. This can be
-    # useful for modelling things like basic shopping carts or form wizards.
-    # Keep in mind the data is signed, so it can't be tampered with. However,
-    # the data is not *encrypted*, so somebody that wanted to could unzip and
-    # load the cookie data to see what's inside. So don't send this data
-    # client-side if it's at all sensitive.
-    class Cookie < Adapter
-
-      attr :verifier
-      attr_accessor :data
-
-      MAX_DATA_LENGTH = 4096
-
-      def self.max_data_length
-        MAX_DATA_LENGTH
-      end
-
-      def initialize(options)
-        @data     = options[:data]
-        @verifier = ActiveSupport::MessageVerifier.new(options[:secret])
-        super
-      end
-
-      def export_data
-        cookie = verifier.generate(Zlib::Deflate.deflate(Marshal.dump(db)))
-        length = cookie.bytesize
-        if length > Cookie.max_data_length
-          raise(AmbryError, "Data is %s bytes, cannot exceed %s" % [length, Cookie.max_data_length])
-        end
-        cookie
-      end
-
-      def import_data
-        (!data || data.empty?) ? {} : Marshal.load(Zlib::Inflate.inflate(verifier.verify(data)))
-      end
-
-      def load_database
-        @db = import_data
-        @db.map(&:freeze)
-      end
-
-      def save_database
-        @data = export_data
-      end
-    end
-  end
-end

data/lib/rack/ambry.rb

@@ -1,23 +0,0 @@
-require "rack/contrib"
-
-module Rack
-  # Rack::Ambry is a middleware that allows you to store a Ambry datbase
-  # in a cookie.
-  # @see Ambry::Adapters::Cookie
-  class Ambry
-    def initialize(app, options = {})
-      @app         = app
-      options      = options.call if options.respond_to? :call
-      @cookie_name = options.delete(:cookie_name) || "ambry_data"
-      @ambry = ::Ambry::Adapters::Cookie.new(options.merge(:sync => true))
-    end
-
-    def call(env)
-      @ambry.data = env["rack.cookies"][@cookie_name]
-      @ambry.load_database
-      status, headers, body = @app.call(env)
-      env["rack.cookies"][@cookie_name] = @ambry.export_data
-      [status, headers, body]
-    end
-  end
-end

data/spec/cookie_adapter_spec.rb

@@ -1,81 +0,0 @@
-require File.expand_path("../spec_helper", __FILE__)
-require "ambry/adapters/cookie"
-
-class User
-  extend Ambry::Model
-  field :email, :name
-end
-
-module CookieAdapterSpecHelpers
-  def secret
-    "ssssshh... this is a secret!"
-  end
-
-  def sample_data
-    # hash = {"User" => {valid_user[:email] => valid_user}}
-    # p ActiveSupport::MessageVerifier.new(secret).generate(Zlib::Deflate.deflate(Marshal.dump(hash)))
-    "BAgiTnicY+GoZvNU4gwtTi1is2JzDQHxhLPyUx2KkzNy81P1kvNz2awZQqrZrTjzEnNTPZX4" +
-    "vfJTFYLBkiAJK67U3MTMHKyaAJGaGlk=--08913fe1c677e4bb0dd34ef90fb22f9027e587f4"
-  end
-
-  def valid_user
-    @valid_user ||= {:name => "Joe Schmoe", :email => "joe@schmoe.com"}
-  end
-
-  def load_fixtures
-    Ambry.adapters.clear
-    @adapter = Ambry::Adapters::Cookie.new \
-      :name   => :cookie,
-      :secret => secret
-    User.use :cookie, :sync => true
-  end
-end
-
-describe Ambry::Adapters::Cookie do
-
-  include CookieAdapterSpecHelpers
-
-  before { load_fixtures }
-  after  { Ambry.adapters.clear }
-
-  describe Ambry::Adapters::Cookie do
-
-    describe "#initialize" do
-      it "should decode signed data if given" do
-        adapter = Ambry::Adapters::Cookie.new \
-          :secret => secret,
-          :data   => sample_data
-        assert_kind_of Hash, adapter.db["User"]
-        assert_equal "joe@schmoe.com", adapter.db["User"].keys.first
-      end
-
-      it "should load properly with nil or blank data" do
-        [nil, ""].each_with_index do |arg, index|
-          adapter = Ambry::Adapters::Cookie.new \
-            :secret => secret,
-            :data   => arg,
-            :name   => :"main_#{index}"
-          assert_instance_of Hash, adapter.db
-        end
-      end
-    end
-
-    describe "#export_data" do
-      it "should encode and sign the database" do
-        User.create \
-          :name  => Faker::Name.name,
-          :email => Faker::Internet.email
-        refute_nil @adapter.export_data
-      end
-    end
-
-    describe "#save_database" do
-      it "should raise a AmbryError if signed data exceeds max data length" do
-        Ambry::Adapters::Cookie.stubs(:max_data_length).returns(1)
-        assert_raises Ambry::AmbryError do
-          User.create valid_user
-        end
-      end
-    end
-  end
-end