cuba-api 0.3.3 → 0.4.0

data/Gemfile

@@ -1,2 +1,6 @@
-source :rubygems
+source 'https://rubygems.org'
+
 gemspec
+
+gem  'copyright-header', '~> 1.0', :platform => :mri
+

data/lib/cuba_api/guard.rb

@@ -22,6 +22,7 @@
 
 module CubaApi
   module Guard
+    warn 'DEPRECATED: guard will disappear as it is now'
     def allowed?( *group_names )
       authenticated? && ( allowed_groups( *group_names ).size > 0 )
     end
@@ -34,4 +35,4 @@ module CubaApi
       current_user.groups
     end
   end
-end
+end

data/lib/cuba_api/input_filter.rb

@@ -9,33 +9,15 @@ module CubaApi
       end
     end
 
-    def new_instance( clazz, context = nil )
-      clazz.new( params( clazz, context ) )
+    def req_filter( model = nil, context = nil )
+      @_filter ||=
+        begin
+          filter = self.class.factory.new_filter( model ).use( context )
+          filter.filter_it( parse_request_body )
+        end
     end
-    alias :new_instance_from_request :new_instance
 
-    def params( clazz = nil, context = nil )
-      filter_params_and_keeps( clazz, context )
-      @_data[ 0 ] || {}
-    end
-    alias :filtered_params :params
-
-    def keeps( clazz = nil, context = nil )
-      filter_params_and_keeps( clazz, context )
-      @_data[ 1 ] || {}
-    end
-
-    def filter_params_and_keeps( clazz, context )
-      if clazz
-        @_data ||= 
-          begin
-            filter = self.class.factory.new_filter( clazz ).use( context )
-            filter.filter_it( parse_request_body )
-          end
-      end
-      @_data ||= {}
-    end
-    private :filter_params_and_keeps
+    protected
 
     def parse_request_body
       if env[ 'CONTENT_TYPE' ] =~ /^application\/json/
@@ -44,6 +26,5 @@ module CubaApi
         {}
       end
     end
-    protected :parse_request_body
   end
 end

data/lib/cuba_api/utils.rb

@@ -1,6 +1,11 @@
 module CubaApi
   module Utils
    
+    # matcher
+    def no_path
+      Proc.new { env[ 'PATH_INFO' ].empty? }
+    end
+
     def to_float( name, default = nil )
      v = req[ name ]
      if v

data/spec/input_filter_spec.rb

@@ -27,12 +27,13 @@ describe CubaApi::InputFilter do
     Cuba.plugin CubaApi::InputFilter
     Cuba.define do
       on post do
-        attr = new_instance( D ).attributes
+        attr = req_filter( D ).new_model.attributes
         # whether hash is ordered-hash should not matter
         res.write attr.keys.sort.collect {|k| attr[k] }.join
       end
       on default do
-        res.write params( D, :update )['message'].to_s + keeps['age'].to_s
+        filter = req_filter( D, :update )
+        res.write filter.params['message'].to_s + filter.age.to_s
       end
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cuba-api
 version: !ruby/object:Gem::Version
+  version: 0.4.0
   prerelease:
-  version: 0.3.3
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -33,13 +33,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     none: false
   prerelease: false
   type: :runtime
@@ -97,29 +97,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
-    none: false
-  prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: copyright-header
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: '10.0'
     none: false
   prerelease: false
   type: :development
@@ -129,13 +113,13 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.0'
     none: false
   prerelease: false
   type: :development
@@ -182,46 +166,46 @@ files:
 - README.md
 - lib/cuba_api.rb~
 - lib/cuba_api.rb
+- lib/cuba_api/ext2mime_rack.rb~
+- lib/cuba_api/guard.rb
 - lib/cuba_api/accept_content.rb
-- lib/cuba_api/reponse_status.rb~
-- lib/cuba_api/response_status.rb
-- lib/cuba_api/config.rb
-- lib/cuba_api/current_user.rb
 - lib/cuba_api/ext2mime_rack.rb
-- lib/cuba_api/reloader_rack.rb
-- lib/cuba_api/reloader_rack.rb~
-- lib/cuba_api/ext2mime_rack.rb~
-- lib/cuba_api/current_user.rb~
 - lib/cuba_api/response_status.rb~
-- lib/cuba_api/utils.rb~
-- lib/cuba_api/config.rb~
-- lib/cuba_api/guard.rb~
+- lib/cuba_api/accept_content.rb~
+- lib/cuba_api/reloader_rack.rb
+- lib/cuba_api/write_aspects.rb~
 - lib/cuba_api/write_aspect.rb~
+- lib/cuba_api/serializer.rb~
+- lib/cuba_api/response_status.rb
 - lib/cuba_api/serializer.rb
-- lib/cuba_api/guard.rb
+- lib/cuba_api/write_aspect.rb
+- lib/cuba_api/current_user.rb~
 - lib/cuba_api/input_filter.rb~
-- lib/cuba_api/accept_content.rb~
-- lib/cuba_api/utils.rb
 - lib/cuba_api/input_filter.rb
-- lib/cuba_api/serializer.rb~
-- lib/cuba_api/write_aspects.rb~
-- lib/cuba_api/write_aspect.rb
-- spec/config_spec.rb~
-- spec/spec_helper.rb
-- spec/input_filter_spec.rb~
-- spec/spec_helper.rb~
-- spec/accept_spec.rb
+- lib/cuba_api/reponse_status.rb~
+- lib/cuba_api/config.rb~
+- lib/cuba_api/guard.rb~
+- lib/cuba_api/reloader_rack.rb~
+- lib/cuba_api/utils.rb
+- lib/cuba_api/current_user.rb
+- lib/cuba_api/utils.rb~
+- lib/cuba_api/config.rb
+- spec/response_status_spec.rb~
 - spec/current_user_spec.rb
+- spec/spec_helper.rb
+- spec/response_status_spec.rb
+- spec/config_spec.rb
+- spec/input_filter_spec.rb
 - spec/current_user_spec.rb~
-- spec/serializer_spec.rb~
 - spec/aspects_spec.rb~
-- spec/response_status_spec.rb~
-- spec/input_filter_spec.rb
 - spec/aspects_spec.rb
 - spec/serializer_spec.rb
-- spec/config_spec.rb
-- spec/response_status_spec.rb
+- spec/spec_helper.rb~
+- spec/input_filter_spec.rb~
+- spec/serializer_spec.rb~
 - spec/accept_spec.rb~
+- spec/config_spec.rb~
+- spec/accept_spec.rb
 - Gemfile
 homepage: http://github.com/mkristian/cuba-api
 licenses:
@@ -251,10 +235,10 @@ signing_key:
 specification_version: 3
 summary: set of plugins for using cuba as API server
 test_files:
-- spec/accept_spec.rb
 - spec/current_user_spec.rb
+- spec/response_status_spec.rb
+- spec/config_spec.rb
 - spec/input_filter_spec.rb
 - spec/aspects_spec.rb
 - spec/serializer_spec.rb
-- spec/config_spec.rb
-- spec/response_status_spec.rb
+- spec/accept_spec.rb