apiway 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e359eb647d0797382fe8d4960a74390d9e453527
-  data.tar.gz: a9bb742d1d44c02040161ed4332efe8cb5b425c1
+  metadata.gz: b0639d207553c6f64190cfee587fa464ce9eb729
+  data.tar.gz: db8521d27328c3438bab63f8893a131772f10cff
 SHA512:
-  metadata.gz: 87bbe8b23efea6c9d3b9d97c41771e26331e139bcfe2bd122babd82481373093111deafdf7382da9f31c626d24617695c2f5877b170f3412ad1052056ae27145
-  data.tar.gz: 2375c4599a6acbcbd3434fc205692cb2362582fd1afa6e71bae644d3b71ae93b7de2a0e11c0bc67435e6428fd5c0d0a99f5a0580eac67efcdab66ea614dd4ff0
+  metadata.gz: c1cb5448f5a7e551425f433fff45c1ef2f03c9aa6ce7a98d6cdcbfb64631ea320a6b04ded5e92d1cd29c8fed29928c920a00b6f6683519c57ebeee955856dfae
+  data.tar.gz: c331b332b90692217a269b86322f155fec29eeab2aec83e954a4e7d8d2792aec028ba39f4e11a03fae63cb64fd5e62af19d4f5c693ac97adc76aabd4d4a8a30f

data/Gemfile

@@ -1,3 +1,3 @@
-source 'https://rubygems.org'
-
-gemspec
+source 'https://rubygems.org'
+
+gemspec

data/lib/apiway/application.rb

@@ -37,11 +37,11 @@ module Apiway
     )
     .map{ |path| Dir[ File.join( root, path ) ] }
     .flatten.uniq.each{ |path| require path }
-    
-    
+
+
     LoggerBase::apiway_log_level       apiway_log
     LoggerBase::activerecord_log_level activerecord_log
-    
+
 
     def self.tasks
       require 'sinatra/activerecord/rake'

data/lib/apiway/commands.rb

@@ -12,7 +12,7 @@ module Apiway
         create:   [ '-n', 'n', 'new'      ],
         help:     [ '-h', 'h', 'help'     ]
       }
-      
+
       DESC = {
         version:  'Show gem version',
         server:   'Launch thin server, alias for `bundle exec thin start`',
@@ -46,10 +46,10 @@ module Apiway
       def create( *args )
         generate "app", *args
       end
-      
+
       def help( *args )
         puts "\n Apiway commands: \n\n"
-        HANDLERS.each do |handler, commands| 
+        HANDLERS.each do |handler, commands|
           puts "  [#{ commands.join( "], [" ) }]".ljust(30) << "# #{ DESC[ handler ] } "
         end
       end

data/lib/apiway/controller.rb

@@ -1,124 +1,124 @@
-module Apiway
-
-  module Controller
-
-
-
-    class << self
-
-      def included( base )
-        base.class_eval do
-          extend  ClassMethods
-          include InstanceMethods
-        end
-      end
-
-    end
-
-
-
-    module ClassMethods
-
-      def action( name, &block )
-        block_given? ? actions[ name ] = block : actions[ name ] or raise ControllerActionNotExists.new( self.name, name )
-      end
-
-      def before_action( method_name, only: [], except: [] )
-        register_filter :before, method_name, only, except
-      end
-
-      def after_action( method_name, only: [], except: [] )
-        register_filter :after, method_name, only, except
-      end
-
-      def select_filters( type, action_name )
-        filters( type ).select do |method_name, only, except|
-          ( only.empty? || only.include?( action_name ) ) && ( except.empty? || !except.include?( action_name ) )
-        end
-      end
-
-
-      private
-
-      def actions
-        @actions ||= {}
-      end
-
-      def filters( type )
-        ( @filters ||= {} )[ type ] ||= []
-      end
-
-      def register_filter( type, method_name, only, except )
-        only   = [].push( only ).flatten
-        except = [].push( except ).flatten
-        filters( type ) << [ method_name, only, except ]
-      end
-
-    end
-
-
-
-    module InstanceMethods
-
-      def initialize( action_name, client, params = {} )
-        @action_name = action_name
-        @action      = self.class.action @action_name
-        @client      = client
-        @params      = params
-      end
-
-      def run
-        begin
-          run_filters :before
-          result = run_action
-          run_filters :after
-        rescue ControllerError => e
-          failure e.params
-        else
-          success result
-        end
-      end
-
-
-      protected
-
-      attr_reader :client, :params
-
-      def trigger( *args )
-        add_method_to_call :trigger, args
-      end
-
-      def error( params )
-        raise ControllerError, params
-      end
-
-
-      private
-
-      def run_action
-        instance_eval &@action
-      end
-
-      def run_filters( type )
-        self.class.select_filters( type, @action_name ).each { |method_name, only, except| send method_name }
-      end
-
-      def add_method_to_call( method, args )
-        Thread.current[ :methods_to_call ] << [ method, args ]
-      end
-
-      def success( *args )
-        add_method_to_call :success, args
-      end
-
-      def failure( *args )
-        add_method_to_call :failure, args
-      end
-
-    end
-
-
-
-  end
-
-end
+module Apiway
+
+  module Controller
+
+
+
+    class << self
+
+      def included( base )
+        base.class_eval do
+          extend  ClassMethods
+          include InstanceMethods
+        end
+      end
+
+    end
+
+
+
+    module ClassMethods
+
+      def action( name, &block )
+        block_given? ? actions[ name ] = block : actions[ name ] or raise ControllerActionNotExists.new( self.name, name )
+      end
+
+      def before_action( method_name, only: [], except: [] )
+        register_filter :before, method_name, only, except
+      end
+
+      def after_action( method_name, only: [], except: [] )
+        register_filter :after, method_name, only, except
+      end
+
+      def select_filters( type, action_name )
+        filters( type ).select do |method_name, only, except|
+          ( only.empty? || only.include?( action_name ) ) && ( except.empty? || !except.include?( action_name ) )
+        end
+      end
+
+
+      private
+
+      def actions
+        @actions ||= {}
+      end
+
+      def filters( type )
+        ( @filters ||= {} )[ type ] ||= []
+      end
+
+      def register_filter( type, method_name, only, except )
+        only   = [].push( only ).flatten
+        except = [].push( except ).flatten
+        filters( type ) << [ method_name, only, except ]
+      end
+
+    end
+
+
+
+    module InstanceMethods
+
+      def initialize( action_name, client, params = {} )
+        @action_name = action_name
+        @action      = self.class.action @action_name
+        @client      = client
+        @params      = params
+      end
+
+      def run
+        begin
+          run_filters :before
+          result = run_action
+          run_filters :after
+        rescue ControllerError => e
+          failure e.params
+        else
+          success result
+        end
+      end
+
+
+      protected
+
+      attr_reader :client, :params
+
+      def trigger( *args )
+        add_method_to_call :trigger, args
+      end
+
+      def error( params )
+        raise ControllerError, params
+      end
+
+
+      private
+
+      def run_action
+        instance_eval &@action
+      end
+
+      def run_filters( type )
+        self.class.select_filters( type, @action_name ).each { |method_name, only, except| send method_name }
+      end
+
+      def add_method_to_call( method, args )
+        Thread.current[ :methods_to_call ] << [ method, args ]
+      end
+
+      def success( *args )
+        add_method_to_call :success, args
+      end
+
+      def failure( *args )
+        add_method_to_call :failure, args
+      end
+
+    end
+
+
+
+  end
+
+end

data/lib/apiway/diff.rb

@@ -28,7 +28,7 @@ module Apiway
       else
 
         unless source.empty?
-         @del[ @del_c ]  = source.size
+          @del[ @del_c ] = @del_c + source.size
         end
 
         unless target.empty?

data/lib/apiway/generator.rb

@@ -12,7 +12,7 @@ module Apiway
         create_model:        [ '-m', 'm', 'model'      ],
         help:                [ '-h', 'h', 'help'       ]
       }
-      
+
       DESC = {
         create_application:  'Creating a new application (`apiway generate app Chat`)',
         create_controller:   'Creating a new controller  (`apiway generate controller Messages`)',
@@ -74,10 +74,10 @@ module Apiway
           end
         end
       end
-      
+
       def help( *args )
         puts "\n Apiway generator commands: \n\n"
-        HANDLERS.each do |handler, commands| 
+        HANDLERS.each do |handler, commands|
           puts "  [#{ commands.join( "], [" ) }]".ljust(30) << "# #{ DESC[ handler ] } "
         end
       end

data/lib/apiway/logger.rb

@@ -1,10 +1,10 @@
 module Apiway
-  
+
   module LoggerBase
-    
-    
+
+
     class << self
-    
+
       def apiway_log_level( level )
         set_log_level( Log, level || :unknown )
       end
@@ -20,22 +20,22 @@ module Apiway
         end
         logger
       end
-      
-      
+
+
       private
 
       def set_log_level( logger, level )
         logger.level = Logger.const_get level.to_s.upcase
         logger
       end
-      
-    end 
-    
-    
+
+    end
+
+
   end
 
 
   Log = LoggerBase::new_logger
-  
+
 
 end

data/lib/apiway/model.rb

@@ -1,58 +1,58 @@
-module Apiway
-
-  module Model
-
-
-
-    class << self
-
-      def included( base )
-        all << base
-        base.class_eval do
-          extend  ClassMethods
-          include InstanceMethods
-        end
-      end
-
-      def all
-        @all ||= []
-      end
-
-    end
-
-
-
-    module ClassMethods
-
-      def self.extended( base )
-        base.class_eval do
-
-          if self.ancestors.include? ActiveRecord::Base
-            after_save    :sync
-            after_destroy :sync
-          end
-
-        end
-      end
-
-      def sync
-        Thread.current[ :changed_models ] << self
-      end
-
-    end
-
-
-
-    module InstanceMethods
-
-      def sync
-        self.class.sync
-      end
-
-    end
-
-
-
-  end
-
-end
+module Apiway
+
+  module Model
+
+
+
+    class << self
+
+      def included( base )
+        all << base
+        base.class_eval do
+          extend  ClassMethods
+          include InstanceMethods
+        end
+      end
+
+      def all
+        @all ||= []
+      end
+
+    end
+
+
+
+    module ClassMethods
+
+      def self.extended( base )
+        base.class_eval do
+
+          if self.ancestors.include? ActiveRecord::Base
+            after_save    :sync
+            after_destroy :sync
+          end
+
+        end
+      end
+
+      def sync
+        Thread.current[ :changed_models ] << self
+      end
+
+    end
+
+
+
+    module InstanceMethods
+
+      def sync
+        self.class.sync
+      end
+
+    end
+
+
+
+  end
+
+end

data/lib/apiway/path.rb

@@ -1,7 +1,7 @@
-module Apiway
-
-  def self.path
-    @gem_path ||= File.expand_path '..', File.dirname( __FILE__ )
-  end
-
-end
+module Apiway
+
+  def self.path
+    @gem_path ||= File.expand_path '..', File.dirname( __FILE__ )
+  end
+
+end

data/lib/apiway/version.rb

@@ -1,5 +1,5 @@
 module Apiway
 
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
 end

data/lib/generator/application/Gemfile

@@ -6,4 +6,4 @@ gem 'apiway'
 # Use sqlite3 as the database for Active Record
 group :development, :test do
   gem 'sqlite3'
-end
+end

data/lib/generator/application/Rakefile

@@ -1,3 +1,3 @@
-require './config/application'
-
-Apiway::Application.tasks
+require './config/application'
+
+Apiway::Application.tasks

data/lib/generator/application/app/base/base.rb

@@ -1,5 +1,5 @@
 class Base
-  
+
   protected
-  
-end
+
+end

data/lib/generator/application/app/controllers/application.rb

@@ -1,5 +1,5 @@
 class ApplicationController < Base
-  
+
   protected
 
 end

data/lib/generator/application/app/resources/application.rb

@@ -1,5 +1,5 @@
 class ApplicationResource < Base
-  
+
   protected
 
 end

data/lib/generator/application/config/environments/development.rb

@@ -2,7 +2,7 @@ Apiway::Application.configure :development do |config|
 
 
   config.set apiway_log:       :info
-  
+
   config.set activerecord_log: :info
 
 

data/lib/generator/application/config/environments/production.rb

@@ -2,7 +2,7 @@ Apiway::Application.configure :production do |config|
 
 
   config.set apiway_log:       false
-  
+
   config.set activerecord_log: false
 
 

data/lib/generator/application/config/environments/test.rb

@@ -2,7 +2,7 @@ Apiway::Application.configure :test do |config|
 
 
   config.set apiway_log:       :error
-  
+
   config.set activerecord_log: :error
 
 

data/lib/generator/templates/controller.tpl

@@ -1,18 +1,18 @@
 class <%= classname %>Controller < ApplicationController
 
   include Apiway::Controller
-  
-  
+
+
 # before_action :auth?
-  
+
 # action :new do
-#   
+#
 #   begin
 #     <%= modelname %>.create! params
 #   rescue Exception => e
 #     error e.message
 #   end
-# 
+#
 # end
 
 # def auth?

data/lib/generator/templates/resource.tpl

@@ -11,17 +11,17 @@ class <%= classname %>Resource < ApplicationResource
 
 
   data do
-   
+
 #   <%= modelname %>.limit( params[ :limit ] ).map do |<%= varname %>|
 #     {
 #       id:   <%= varname %>.id,
 #       name: <%= varname %>.name
 #     }
-#   end   
-     
+#   end
+
   end
-  
-  
+
+
 # def auth?
 #   error :auth_error unless client[ :user_id ]
 # end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apiway
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - 4urbanoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin