apipie-rails 0.0.7 → 0.0.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apipie-rails (0.0.6)
+    apipie-rails (0.0.7)
 
 GEM
   remote: http://rubygems.org/

data/apipie-rails.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "rails", ">= 3.0.10"
   s.add_development_dependency "sqlite3"
-  s.add_development_dependency "rspec-rails"
   s.add_development_dependency "minitest"
   s.add_development_dependency "redcarpet"
   s.add_development_dependency "RedCloth"

data/lib/apipie/client/generator.rb

@@ -14,6 +14,8 @@ module Apipie
 
       # Define arguments and options
       argument :name
+      argument :subject
+      argument :suffix
 
       attr_reader :doc, :resource
 
@@ -26,34 +28,52 @@ module Apipie
         File.expand_path("../template", __FILE__)
       end
 
-      def self.destination_root(name)
-        File.join(FileUtils.pwd, "#{name}_client")
+      def self.destination_root(name, suffix)
+        File.join(FileUtils.pwd, "#{name}#{suffix}")
       end
 
-      def self.start(client_name)
+      def self.start(client_name, subject = :all, suffix = '_client')
         name = client_name.parameterize.underscore
-        super([name], :destination_root => destination_root(name))
+        suffix = suffix.parameterize.underscore
+        super([name, subject, suffix], :destination_root => destination_root(name, suffix))
+      end
+
+      def all?
+        subject == :all
       end
 
       def generate_cli
+        full_name = "#{name}#{suffix}"
         template("README.tt", "README")
         template("Gemfile.tt", "Gemfile")
-        template("bin.rb.tt", "bin/#{name}_client")
-        chmod("bin/#{name}_client", 0755)
-        template("client.rb.tt", "lib/#{name}_client.rb")
-        template("base.rb.tt", "lib/#{name}_client/base.rb")
-        template("cli_command.rb.tt", "lib/#{name}_client/cli_command.rb")
+        template("Rakefile.tt", "Rakefile")
+        template("client.gemspec.tt", "#{full_name}.gemspec")
+        template("client.rb.tt", "lib/#{full_name}.rb")
+        template("base.rb.tt", "lib/#{full_name}/base.rb")
+        template("rest_client_oauth.rb.tt", "lib/#{full_name}/rest_client_oauth.rb")
+        template("version.rb.tt", "lib/#{full_name}/version.rb")
+        if all?
+          template("bin.rb.tt", "bin/#{full_name}")
+          chmod("bin/#{full_name}", 0755)
+          template("cli_command.rb.tt", "lib/#{full_name}/cli_command.rb")
+        end
         doc[:resources].each do |key, resource|
           @resource = resource
-          template("cli.rb.tt", "lib/#{name}_client/commands/#{resource_name}.thor")
-          template("resource.rb.tt", "lib/#{name}_client/resources/#{resource_name}.rb")
+          if all?
+            template("cli.rb.tt", "lib/#{full_name}/commands/#{resource_name}.thor")
+          end
+          template("resource.rb.tt", "lib/#{full_name}/resources/#{resource_name}.rb")
         end
       end
 
       protected
 
       def class_base
-        name.camelize
+        @class_base ||= name.camelize
+      end
+
+      def class_suffix
+        @class_suffix ||= suffix.camelize
       end
 
       def plaintext(text)

data/lib/apipie/client/template/Gemfile.tt

@@ -1,5 +1,3 @@
 source :rubygems
 
-gem 'thor', '>= 0.15.4'
-gem 'json'
-gem 'rest-client', '>= 1.6.1'
+gemspec

data/lib/apipie/client/template/Rakefile.tt

@@ -0,0 +1,2 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/lib/apipie/client/template/base.rb.tt

@@ -1,17 +1,29 @@
 require 'rest_client'
+require 'oauth'
 require 'json'
+require '<%= name %><%= suffix %>/rest_client_oauth'
 
-module <%= class_base %>Client
+module <%= class_base %><%= class_suffix %>
   class Base
     attr_reader :client
 
-    def initialize(config)
-      @client =  RestClient::Resource.new(config[:base_url], :user => config[:username], :password => config[:password])
+    def initialize(config = <%= class_base %><%= class_suffix %>.client_config)
+      @client = RestClient::Resource.new(config[:base_url],
+                                         :user     => config[:username],
+                                         :password => config[:password],
+                                         :oauth    => config[:oauth],
+                                         :headers  => { :content_type => 'application/json',
+                                                        :accept       => 'application/json' })
     end
 
-    def call(method, path, params = {})
-      ret = client[path].send(method, params)
-      data = JSON.parse(ret.body) rescue ret.body
+    def call(method, path, payload = nil)
+      a, *_ = [method, payload ? payload.to_json : nil].compact
+      ret  = client[path].send(a)
+      data = begin
+        JSON.parse(ret.body)
+      rescue JSON::ParserError
+        ret.body
+      end
       return data, ret
     end
 

data/lib/apipie/client/template/bin.rb.tt

@@ -5,8 +5,8 @@ require "thor"
 require 'thor/core_ext/file_binary_read'
 
 $: << File.expand_path("../../lib", __FILE__)
-require "<%= name %>_client"
-require "<%= name %>_client/cli_command"
+require "<%= name %><%= suffix %>"
+require "<%= name %><%= suffix %>/cli_command"
 
 module <%= class_base %>Cli
   class Main < Thor
@@ -37,8 +37,8 @@ module <%= class_base %>Cli
         parser = Thor::Options.new({:username => Thor::Option.parse(%w[username -u], :string),
                                    :password => Thor::Option.parse(%w[password -p], :string)})
         opts = parser.parse(given_args)
-        <%= class_base %>Client.client_config[:username] = opts["username"]
-        <%= class_base %>Client.client_config[:password] = opts["password"]
+        <%= class_base %><%= class_suffix %>.client_config[:username] = opts["username"]
+        <%= class_base %><%= class_suffix %>.client_config[:password] = opts["password"]
         #remaining =  parser.instance_variable_get("@unknown") # TODO: this is an ugly hack :(
         remaining = parser.remaining
         super(task, remaining, given_options, config)
@@ -69,14 +69,14 @@ module <%= class_base %>Cli
     end
 
     def thorfiles
-      Dir[File.expand_path("../../lib/<%= name %>_client/commands/*.thor", __FILE__)]
+      Dir[File.expand_path("../../lib/<%= name %><%= suffix %>/commands/*.thor", __FILE__)]
     end
 
     # Display information about the given klasses. If with_module is given,
     # it shows a table with information extracted from the yaml file.
     #
     def display_klasses(with_modules=false, show_internal=false, klasses=Thor::Base.subclasses)
-      klasses -= [Thor, Main, ::<%= class_base %>Client::CliCommand] unless show_internal
+      klasses -= [Thor, Main, ::<%= class_base %><%= class_suffix %>::CliCommand] unless show_internal
 
       show_modules if with_modules && !thor_yaml.empty?
 
@@ -107,4 +107,8 @@ begin
 rescue RestClient::Exception => e
   $stderr.puts e.message
   exit 1
+rescue Errno::ECONNREFUSED => e
+  $stderr.puts "Server #{<%= class_base %><%= class_suffix %>.client_config[:base_url]} not available"
+  $stderr.puts e.message
+  exit 1
 end

data/lib/apipie/client/template/cli.rb.tt

@@ -1,4 +1,4 @@
-class <%= resource_name.camelize %> < <%= class_base %>Client::CliCommand
+class <%= resource_name.camelize %> < <%= class_base %><%= class_suffix %>::CliCommand
 
 <% resource[:methods].each do |method| -%>
   desc '<%= method[:name] %>', '<%= api(method)[:short_description] %>'

data/lib/apipie/client/template/cli_command.rb.tt

@@ -1,9 +1,9 @@
-module <%= class_base %>Client
+module <%= class_base %><%= class_suffix %>
   class CliCommand < Thor
     no_tasks do
       def client
-        resource_class = <%= class_base %>Client::Resources.const_get(self.class.name[/[^:]*$/])
-        @client ||= resource_class.new(<%= class_base %>Client.client_config)
+        resource_class = <%= class_base %><%= class_suffix %>::Resources.const_get(self.class.name[/[^:]*$/])
+        @client ||= resource_class.new(<%= class_base %><%= class_suffix %>.client_config)
       end
 
       def transform_options(inline_params, transform_hash = {})

data/lib/apipie/client/template/client.gemspec.tt

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/<%= name %><%= suffix %>/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["TODO"]
+  gem.email         = ["TODO"]
+  gem.description   = %q{TODO: Write a gem description}
+  gem.summary       = %q{TODO: Write a gem summary}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "<%= name %><%= suffix %>"
+  gem.require_paths = ["lib"]
+  gem.version       = <%= class_base %><%= class_suffix %>::VERSION
+
+  gem.add_dependency 'thor', '>= 0.15.4'
+  gem.add_dependency 'json'
+  gem.add_dependency 'rest-client', '>= 1.6.1'
+  gem.add_dependency 'oauth'
+end

data/lib/apipie/client/template/client.rb.tt

@@ -1,10 +1,13 @@
-require '<%= name %>_client/base'
+require '<%= name %><%= suffix %>/base'
+require '<%= name %><%= suffix %>/version'
 
-resource_files = Dir[File.expand_path('../<%= name %>_client/resources/*.rb', __FILE__)]
+resource_files = Dir[File.expand_path('../<%= name %><%= suffix %>/resources/*.rb', __FILE__)]
 resource_files.each { |f| require f }
 
-module <%= class_base %>Client
+module <%= class_base %><%= class_suffix %>
   def self.client_config
-    @client_config ||= {:base_url => "http://localhost:3000"}
+    @client_config ||= { :base_url => "http://localhost:3000",
+                         :oauth    => { :consumer_key    => 'consumer',
+                                        :consumer_secret => 'shhhh' } }
   end
 end

data/lib/apipie/client/template/resource.rb.tt

@@ -1,6 +1,6 @@
-module <%= class_base %>Client
+module <%= class_base %><%= class_suffix %>
   module Resources
-    class <%= resource_name.camelize %> < <%= class_base %>Client::Base
+    class <%= resource_name.camelize %> < <%= class_base %><%= class_suffix %>::Base
 <% resource[:methods].each do |method| -%>
 
       def <%= method[:name] %><%= "(#{ client_args(method).join(", ") })" if client_args(method).any? %>

data/lib/apipie/client/template/rest_client_oauth.rb.tt

@@ -0,0 +1,29 @@
+unless RestClient.const_defined? :OAUTH_EXTENSION
+  RestClient::OAUTH_EXTENSION = lambda do |request, args|
+    if args[:oauth]
+      uri             = URI.parse args[:url]
+      default_options = { :site               => "#{uri.scheme}://#{uri.host}:#{uri.port.to_s}",
+                          :request_token_path => "",
+                          :authorize_path     => "",
+                          :access_token_path  => "" }
+      options         = default_options.merge args[:oauth][:options] || { }
+      consumer        = OAuth::Consumer.new(args[:oauth][:consumer_key], args[:oauth][:consumer_secret], options)
+
+
+      method_to_http_request = { :get    => Net::HTTP::Get,
+                                 :post   => Net::HTTP::Post,
+                                 :put    => Net::HTTP::Put,
+                                 :delete => Net::HTTP::Delete }
+
+      http_request = method_to_http_request[args[:method]].
+          new(args[:url]) # create Net::HTTPRequest to get oauth header,
+                          # because RestClient::Request is not supported by Oauth
+      consumer.sign!(http_request)
+      request['Authorization'] = http_request['Authorization'] # add oauth header to rest_client request
+    end
+  end
+end
+
+unless RestClient.before_execution_procs.include? RestClient::OAUTH_EXTENSION
+  RestClient.add_before_execution_proc &RestClient::OAUTH_EXTENSION
+end

data/lib/apipie/client/template/version.rb.tt

@@ -0,0 +1,3 @@
+module <%= class_base %><%= class_suffix %>
+  VERSION = "0.0.1"
+end

data/lib/apipie/method_description.rb

@@ -16,7 +16,9 @@ module Apipie
       private
 
       def create_api_url(path)
-        "#{Apipie.configuration.api_base_url}#{path}"
+        path = "#{Apipie.configuration.api_base_url}#{path}"
+        path = path[0..-2] if path[-1..-1] == '/'
+        return path
       end
 
     end

data/lib/apipie/validator.rb

@@ -57,7 +57,7 @@ module Apipie
 
       # what type is expected, mostly string
       # this information is used in cli client
-      # thor supported types — :string, :hash, :array, :numeric, or :boolean
+      # thor supported types :string, :hash, :array, :numeric, or :boolean
       def expected_type
         'string'
       end

data/lib/apipie/version.rb

@@ -1,3 +1,3 @@
 module Apipie
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/lib/tasks/apipie.rake

@@ -124,15 +124,28 @@ namespace :apipie do
     FileUtils.cp_r "#{src}/.", dest
   end
 
+  namespace :client do
+    task :all, [:suffix] => [:environment] do |t, args|
+      args.with_defaults(:suffix => "_client")
+      Apipie.configuration.use_cache = false # we don't want to skip DSL evaluation
+      Apipie.api_controllers_paths.each { |file| require file }
 
-  desc "Generate CLI client for API documented with apipie gem."
-  task :client => [:environment] do |t, args|
-    Apipie.configuration.use_cache = false # we don't want to skip DSL evaluation
-    Apipie.api_controllers_paths.each { |file| require file }
+      Apipie::Client::Generator.start(Apipie.configuration.app_name, :all, args[:suffix])
+    end
+
+    desc "Generate only ruby bindings for API documented with apipie gem."
+    task :bindings, [:suffix] => [:environment] do |t, args|
+      args.with_defaults(:suffix => "_client")
+      Apipie.configuration.use_cache = false # we don't want to skip DSL evaluation
+      Apipie.api_controllers_paths.each { |file| require file }
 
-    Apipie::Client::Generator.start(Apipie.configuration.app_name)
+      Apipie::Client::Generator.start(Apipie.configuration.app_name, :bindings, args[:suffix])
+    end
   end
 
+  desc "Generate CLI client for API documented with apipie gem."
+  task :client, [:suffix] => 'client:all'
+
   def plaintext(text)
     text.gsub(/<.*?>/, '').gsub("\n",' ').strip
   end

data/rel-eng/packages/rubygem-apipie-rails

@@ -0,0 +1 @@
+0.0.7-1 /

data/rubygem-apipie-rails.spec

@@ -1,28 +1,25 @@
-%define gem_name apipie-rails
-
-Name: rubygem-%{gem_name}
-Version: 0.0.6
-Release: 1%{?dist}
-Summary: Rails API documentation tool and client generator.
-
-Group: Development/Libraries
-License: MIT
-URL: https://github.com/Pajk/apipie-rails
-Source0: http://rubygems.org/downloads/%{gem_name}-%{version}.gem
+%global gemname apipie-rails
 
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
 %if 0%{?rhel} == 6 || 0%{?fedora} < 17
 %define rubyabi 1.8
 %else
 %define rubyabi 1.9
 %endif
+
+Summary: Rails API documentation tool and client generator.
+Name: rubygem-%{gemname}
+Version: 0.0.7
+Release: 2%{?dist}
+Group: Development/Libraries
+License: MIT
+URL: http://github.com/Pajk/apipie-rails
+Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem
 Requires: ruby(abi) >= %{rubyabi}
-Requires: ruby(rubygems)
-Requires: ruby
 BuildRequires: ruby(abi) >= %{rubyabi}
-BuildRequires: rubygems-devel
-BuildRequires: ruby
 BuildArch: noarch
-Provides: rubygem(%{gem_name}) = %{version}
+Provides: rubygem(%{gemname}) = %{version}
 
 %description
 This gem adds new methods to Rails controllers that can be used to describe
@@ -30,43 +27,47 @@ resources exposed by API. Informations entered with provided DSL are used
 to generate documentation, client or to validate incoming requests.
 
 %prep
-gem unpack %{SOURCE0}
-%setup -q -D -T -n %{gem_name}-%{version}
-gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
-
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            --force %{SOURCE0}
 
 %build
-mkdir -p .%{gem_dir}
-
-# Create the gem as gem install only works on a gem file
-gem build %{gem_name}.gemspec
-
-# gem install compiles any C extensions and installs into a directory
-# We set that to be a local directory so that we can move it into the
-# buildroot in %%install
-gem install -V \
-        --local \
-        --install-dir ./%{gem_dir} \
-        --bindir ./%{_bindir} \
-        --force \
-        --rdoc \
-        %{gem_name}-%{version}.gem
 
 %install
-mkdir -p %{buildroot}%{gem_dir}
-cp -a ./%{gem_dir}/* %{buildroot}%{gem_dir}/
-
-%files
-%{gem_dir}/gems/%{gem_name}-%{version}/
-
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* \
+        %{buildroot}%{gemdir}/
 
-%doc MIT-LICENSE README.rdoc
 
-%{gem_dir}/cache/%{gem_name}-%{version}.gem
-%{gem_dir}/specifications/%{gem_name}-%{version}.gemspec
-%{gem_docdir}
+%files
+%{geminstdir}/app
+%{geminstdir}/lib
+%{geminstdir}/apipie-rails.gemspec
+%{geminstdir}/Gemfile
+%{geminstdir}/Gemfile.lock
+%{geminstdir}/Rakefile
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+
+%exclude %{geminstdir}/spec
+%exclude %{geminstdir}/rel-eng
+%exclude %{geminstdir}/.gitignore
+%exclude %{geminstdir}/.rspec
+%exclude %{geminstdir}/.rvmrc
+%exclude %{geminstdir}/.travis.yml
+%exclude %{geminstdir}/rubygem-apipie-rails.spec
+%exclude %{gemdir}/cache/%{gemname}-%{version}.gem
+%exclude %{gemdir}/doc/%{gemname}-%{version}
+
+%doc %{geminstdir}/MIT-LICENSE
+%doc %{geminstdir}/README.rdoc
+%doc %{geminstdir}/APACHE-LICENSE-2.0
+%doc %{geminstdir}/NOTICE
 
 %changelog
-* Fri Jul 20 2012 Pavel Pokorný <pajkycz@gmail.com> 0.0.6-1
-- new RPM package built with tito
+* Thu Jul 26 2012 Pavel Pokorný <pajkycz@gmail.com> 0.0.7-2
+- removed doc files from rpm
+
+* Wed Jul 25 2012 Pavel Pokorný <pajkycz@gmail.com> 0.0.7-1
+- new package built with tito
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apipie-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -60,22 +60,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -148,7 +132,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .autotest
 - .gitignore
 - .rspec
 - .rvmrc
@@ -185,12 +168,16 @@ files:
 - lib/apipie/client/generator.rb
 - lib/apipie/client/template/Gemfile.tt
 - lib/apipie/client/template/README.tt
+- lib/apipie/client/template/Rakefile.tt
 - lib/apipie/client/template/base.rb.tt
 - lib/apipie/client/template/bin.rb.tt
 - lib/apipie/client/template/cli.rb.tt
 - lib/apipie/client/template/cli_command.rb.tt
+- lib/apipie/client/template/client.gemspec.tt
 - lib/apipie/client/template/client.rb.tt
 - lib/apipie/client/template/resource.rb.tt
+- lib/apipie/client/template/rest_client_oauth.rb.tt
+- lib/apipie/client/template/version.rb.tt
 - lib/apipie/dsl_definition.rb
 - lib/apipie/error_description.rb
 - lib/apipie/extractor.rb
@@ -209,6 +196,7 @@ files:
 - lib/apipie/version.rb
 - lib/tasks/apipie.rake
 - rel-eng/packages/.readme
+- rel-eng/packages/rubygem-apipie-rails
 - rel-eng/tito.props
 - rubygem-apipie-rails.spec
 - spec/controllers/apipies_controller_spec.rb

data/.autotest

@@ -1,3 +0,0 @@
-require "autotest/growl"
-require "autotest/fsevent"
-