vodka 0.1.0 → 0.1.2

data/spec/dummy/config/initializers/mongo_mapper_connection.rb

@@ -0,0 +1,4 @@
+config = YAML::load_file(Rails.root + 'config/mongoid.yml')[Rails.env]['sessions']['default']
+host, port = *config['hosts'].first.split(?:)
+MongoMapper.connection = Mongo::Connection.new(host, port)
+MongoMapper.database = config['database']

data/spec/dummy/config/initializers/vodka_setup.rb

@@ -1,4 +1,5 @@
 Vodka::Server.configure do |c|
   c.request_secret = '8089c2189321798bf60df6b8c01bb661fb585080'
   c.response_secret = '3ecb42ac23cd58994a6518971e7e31d2f4545e3c'
+  c.prefix = '/vodka/'
 end

data/spec/dummy/config/mongoid.yml

@@ -0,0 +1,32 @@
+development:
+  sessions:
+    default:
+      database: dummy_test
+      hosts:
+        - localhost:27017
+      options:
+        consistency: :strong
+        max_retries: 1
+        retry_interval: 0
+
+test:
+  sessions:
+    default:
+      database: dummy_test
+      hosts:
+        - localhost:27017
+      options:
+        consistency: :strong
+        max_retries: 1
+        retry_interval: 0
+
+production:
+  sessions:
+    default:
+      database: dummy_test
+      hosts:
+        - localhost:27017
+      options:
+        consistency: :strong
+        max_retries: 1
+        retry_interval: 0

data/spec/dummy/config/routes.rb

@@ -2,6 +2,10 @@ Dummy::Application.routes.draw do
   namespace :vodka do
     resources :articles do
       collection{ get :hello }
+      resources :comments
     end
+    resources :authors
   end
+
+  resources :articles
 end

data/spec/dummy/config/thin.yml

@@ -4,7 +4,7 @@ timeout: 30
 max_conns: 1024
 port: 3000
 max_persistent_conns: 512
-environment: test
+environment: development
 servers: 1
 address: 0.0.0.0
 daemonize: true

data/spec/dummy/db/migrate/20130217185353_create_articles.rb

@@ -2,6 +2,7 @@ class CreateArticles < ActiveRecord::Migration
   def change
     create_table :articles do |t|
       t.string :title
+      t.string :author_id
 
       t.timestamps
     end

data/spec/dummy/db/schema.rb

@@ -15,6 +15,7 @@ ActiveRecord::Schema.define(:version => 20130217185353) do
 
   create_table "articles", :force => true do |t|
     t.string   "title"
+    t.string   "author_id"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end

data/spec/dummy/db/seeds.rb

@@ -1 +1,18 @@
-10.times{ Article.create(title: 'Whatever') }
+Article.delete_all
+ActiveRecord::Base.connection.execute('VACUUM')
+ActiveRecord::Base.connection.execute('DELETE FROM SQLITE_SEQUENCE WHERE name="articles"')
+Author.delete_all
+Comment.delete_all
+
+authors = 10.times.map{ Author.create(name: 'John Doe') }
+
+10.times do
+  article = Article.create(title: 'Whatever', author_id: authors.sample.id.to_s)
+  5.times do
+    comment = Comment.create(article_id: article.id.to_s, author_id: authors.sample.id.to_s, body: 'Nice!')
+    5.times do
+      comment.likes << Like.new(author_id: authors.sample.id.to_s)
+    end
+    comment.save
+  end
+end

data/spec/her/extensions/paginated/paginate_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe Vodka::Her::Extensions::Paginated do
+  describe '.paginate' do
+    it 'should return a collection with desired page, items per page and page info in metadata' do
+      total = Article.all.count
+      articles = Article.paginate(page: 2, per_page: 5)
+
+      articles.should be_instance_of(Vodka::Her::Extensions::PaginatedCollection)
+      articles.size.should == 5
+      articles.current_page.should == 2
+      articles.per_page.should == 5
+      articles.total_entries.should == total
+    end
+
+    it 'should work with where-conditions correctly' do
+      total = Article.all.count
+      articles = Article.where('id > ?', 1).where(title: 'Whatever').paginate(page: 1, per_page: 3)
+
+      articles.should be_instance_of(Vodka::Her::Extensions::PaginatedCollection)
+      articles.size.should == 3
+      articles.current_page.should == 1
+      articles.per_page.should == 3
+      articles.total_entries.should == total
+
+      articles.each do |article|
+        article.id.should > 1
+        article.title.should == 'Whatever'
+      end
+    end
+  end
+end

data/spec/middleware/response_locale_spec.rb

@@ -8,5 +8,7 @@ describe Vodka::Client::Middleware::SignedRequest do
 
     I18n.locale = :ru
     Article.hello.metadata[:hello].should == 'Привет, мир!'
+
+    I18n.locale = :en
   end
 end

data/spec/requests/relations_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe "Nested resources" do
+  it 'should work' do
+    comments = Article.first.comments
+    comments.size.should > 0
+    comments.first.should be_instance_of(Comment)
+  end
+end

data/spec/spec_helper.rb

@@ -5,13 +5,14 @@ require 'vodka/client'
 
 # Dummy Client
 require 'client/article'
+require 'client/author'
+require 'client/comment'
 
 Vodka::Client.configure do |c|
   c.api_url = 'http://0.0.0.0:3000/vodka'
   c.request_secret = '8089c2189321798bf60df6b8c01bb661fb585080'
   c.response_secret = '3ecb42ac23cd58994a6518971e7e31d2f4545e3c'
 end
-Vodka::Client.configure_her!
 
 RSpec.configure do |c|
   # Use color in STDOUT

data/vodka.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = Vodka::VERSION
 
-  gem.add_runtime_dependency 'her', '~> 0.4'
+  gem.add_runtime_dependency 'extended_her', '~> 0.5'
   gem.add_runtime_dependency 'multi_json', '~> 1.6.1'
   gem.add_development_dependency 'rspec', '~> 2.12.0'
   gem.add_development_dependency 'i18n', '~> 0.6.1'

metadata

@@ -2,30 +2,30 @@
 name: vodka
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Gregory Eremin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     none: false
-  name: her
+  name: extended_her
   type: :runtime
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     none: false
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -100,8 +100,6 @@ files:
 - lib/vodka/client/middleware/signed_request.rb
 - lib/vodka/client/middleware/signed_response.rb
 - lib/vodka/configuration.rb
-- lib/vodka/her/extensions/extended_orm.rb
-- lib/vodka/her/extensions/will_paginate.rb
 - lib/vodka/server.rb
 - lib/vodka/server/controllers/vodka_controller.rb
 - lib/vodka/server/handlers/resource.rb
@@ -109,23 +107,37 @@ files:
 - lib/vodka/server/handlers/scaffold.rb
 - lib/vodka/server/middleware/signed_request.rb
 - lib/vodka/server/plugins/presentable.rb
+- lib/vodka/server/presenters/vodka_presenter.rb
 - lib/vodka/server/railtie.rb
+- lib/vodka/server/relation.rb
 - lib/vodka/server/response.rb
 - lib/vodka/version.rb
 - script/bundle_dummy
 - script/ci
+- script/dummy_console
 - script/setup_db
 - script/show_logs
 - script/spec
 - script/start_server
 - script/stop_server
 - spec/client/article.rb
+- spec/client/author.rb
+- spec/client/comment.rb
 - spec/dummy/Gemfile
 - spec/dummy/Gemfile.lock
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/articles_controller.rb
 - spec/dummy/app/controllers/vodka/articles_controller.rb
+- spec/dummy/app/controllers/vodka/authors_controller.rb
+- spec/dummy/app/controllers/vodka/comments_controller.rb
 - spec/dummy/app/models/article.rb
+- spec/dummy/app/models/author.rb
+- spec/dummy/app/models/comment.rb
+- spec/dummy/app/models/like.rb
+- spec/dummy/app/presenters/article_presenter.rb
+- spec/dummy/app/presenters/author_custom_presenter.rb
+- spec/dummy/app/presenters/comment_presenter.rb
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -137,12 +149,14 @@ files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/mongo_mapper_connection.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/vodka_setup.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/locales/ru.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/thin.yml
 - spec/dummy/db/migrate/20130217185353_create_articles.rb
@@ -158,11 +172,12 @@ files:
 - spec/her/extensions/extended_orm/update_attribute_spec.rb
 - spec/her/extensions/extended_orm/update_attributes_spec.rb
 - spec/her/extensions/extended_orm/where_spec.rb
-- spec/her/extensions/will_paginate/paginate_spec.rb
+- spec/her/extensions/paginated/paginate_spec.rb
 - spec/middleware/error_aware_spec.rb
 - spec/middleware/response_locale_spec.rb
 - spec/middleware/signed_request_spec.rb
 - spec/middleware/signed_response_spec.rb
+- spec/requests/relations_spec.rb
 - spec/spec_helper.rb
 - vodka.gemspec
 homepage: https://github.com/magnolia-fan/vodka

data/lib/vodka/her/extensions/extended_orm.rb

@@ -1,92 +0,0 @@
-module Vodka
-  module Her
-    module Extensions
-      module ExtendedOrm
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          def create!(*args)
-            resource = create(*args)
-            unless resource.errors.empty?
-              error = [resource.errors.keys.first, resource.errors.values.first].join(' ')
-              raise Vodka::Client::ResourceException.new(error)
-            end
-
-            resource
-          end
-
-          def first
-            resources = all(vodka_special_action: 'first')
-            resource = resources.first
-            resource.errors = resources.errors
-            resource.metadata = resources.metadata
-            resource
-          end
-
-          def last
-            resources = all(vodka_special_action: 'last')
-            resource = resources.first
-            resource.errors = resources.errors
-            resource.metadata = resources.metadata
-            resource
-          end
-
-          def where(*args)
-            @where_conditions ||= []
-            @where_conditions << args
-            self
-          end
-
-          def all(params = {})
-            unless @where_conditions.nil?
-              params[:vodka_special_where] = MultiJson.dump(@where_conditions)
-              @where_conditions = nil
-            end
-            super(params)
-          end
-        end
-
-        def update_attributes(params)
-          params.each do |attribute, value|
-            send(:"#{attribute}=", value)
-          end
-          save
-        end
-
-        def update_attributes!(params)
-          update_attributes(params)
-          unless errors.empty?
-            error = [errors.keys.first, errors.values.first].join(' ')
-            raise Vodka::Client::ResourceException.new(error)
-          end
-
-          self
-        end
-
-        def update_attribute(attribute, value)
-          update_attributes(attribute => value)
-        end
-
-        def update_attribute!(attribute, value)
-          update_attributes!(attribute => value)
-        end
-
-        def destroy!
-          destroy
-          raise Vodka::Client::FailedActionException.new('Destroy failed') if metadata[:vodka_action_success] == false
-          self
-        end
-
-        def delete
-          destroy
-        end
-
-        def delete!
-          destroy!
-        end
-      end
-    end
-  end
-end
-
-Her::Model.send(:include, Vodka::Her::Extensions::ExtendedOrm)

data/lib/vodka/her/extensions/will_paginate.rb

@@ -1,32 +0,0 @@
-module Vodka
-  module Her
-    module Extensions
-      module WillPaginate
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          def paginate(params)
-            response = all(params)
-            PaginatedCollection.new(response, response.metadata, response.errors)
-          end
-        end
-      end
-
-      class PaginatedCollection < ::Her::Collection
-        def current_page
-          metadata[:page].to_i
-        end
-
-        def per_page
-          metadata[:per_page].to_i
-        end
-
-        def total_entries
-          metadata[:total].to_i
-        end
-      end
-    end
-  end
-end
-
-Her::Model.send(:include, Vodka::Her::Extensions::WillPaginate)

data/spec/her/extensions/will_paginate/paginate_spec.rb

@@ -1,16 +0,0 @@
-require 'spec_helper'
-
-describe Vodka::Her::Extensions::WillPaginate do
-  describe '.paginate' do
-    it 'should return a collection with desired page, items per page and page info in metadata' do
-      total = Article.all.count
-      articles = Article.paginate(page: 2, per_page: 5)
-
-      articles.should be_instance_of(Vodka::Her::Extensions::PaginatedCollection)
-      articles.size.should == 5
-      articles.current_page.should == 2
-      articles.per_page.should == 5
-      articles.total_entries.should == total
-    end
-  end
-end