rails-add_ons 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 963bb8277207578ae5916394485eb2adb8c0e8ea
-  data.tar.gz: 1ab4b5ac4548ec0f88f66cf99ab712c22d88f331
+  metadata.gz: ec60bb83abbf6700fdc1e9d9bad0aeab41c0d42d
+  data.tar.gz: 6768f210ab47e3c60bf57dcfecea186f1a4998e8
 SHA512:
-  metadata.gz: e7e66a7c872436641d6f8e28c2b23d891d3b2c0122153e68ad57b2ab9817d56239d00dd42ceeec001c337740c371201db922c233ee3e27be0ea8a13896a664a2
-  data.tar.gz: d09be621db5157cac495193403b0e8e88f9672c3b424f0aefdc1f0e14163db67e5ccb478c79b9fefa3d9e563efbe6ee089749ca22c0b98d6f97df1d229ad225a
+  metadata.gz: 12e994afc0b6ab5eb2f0731f7c1454866b2af87b19b7f95dc38afdeee55d3854aaad261e97864c3a2141cd96b0c76f2977b8165b04a7253052b759964a67a290
+  data.tar.gz: 6756eff8bcde2f8b3fe5c1b638815215132e660864edefe8f539eecd5a263a00014308d6034e708c9f4e0c233150fcac0d6d23ad40e5ec9aa124ad3ec559280f

data/app/controllers/api/resources_controller/base.rb

@@ -112,9 +112,9 @@ module Api
           request.query_parameters.each do |field, condition|
             case field
             when 'limit'
-              scope = scope.limit(condition)
+              scope = scope.limit(condition.to_i)
             when 'offset'
-              scope = scope.offset(condition)
+              scope = scope.offset(condition.to_i)
             when 'order'
               scope = scope.order(condition)
             when 'includes'
@@ -190,7 +190,9 @@ module Api
         private
 
         def load_count
-          @count = resource_class.count
+          base_scope = resource_class
+          scope = add_conditions_from_query(base_scope)
+          @count = scope.count
         end
       end
 
@@ -241,6 +243,67 @@ module Api
           @count = resource_class.delete_all
         end
       end
+
+      module FirstAction
+        extend ActiveSupport::Concern
+
+        included do
+          if respond_to?(:before_action)
+            before_action :load_first, only: [:first]
+          else
+            before_filter :load_first, only: [:first]
+          end
+        end
+
+        def first
+          respond_to do |format|
+            if @resource.nil?
+              format.json { render json: nil }
+            else
+              format.json { render json: [serialize_resource(@resource)] }
+            end
+          end
+        end
+
+        private
+
+        def load_first
+          base_scope = resource_class
+          scope = add_conditions_from_query(base_scope)
+          @resource = scope.first
+        end
+      end
+
+      module LastAction
+        extend ActiveSupport::Concern
+
+        included do
+          if respond_to?(:before_action)
+            before_action :load_last, only: [:last]
+          else
+            before_filter :load_last, only: [:last]
+          end
+        end
+
+        def last
+          respond_to do |format|
+            if @resource.nil?
+              format.json { render json: nil }
+            else
+              format.json { render json: [serialize_resource(@resource)] }
+            end
+          end
+        end
+
+        private
+
+        def load_last
+          base_scope = resource_class
+          scope = add_conditions_from_query(base_scope)
+          @resource = scope.last
+        end
+      end
+
       include RestActions
       include Resources
       include RestResourceUrls
@@ -248,6 +311,8 @@ module Api
       include CountAction
       include DestroyAllAction
       include DeleteAllAction
+      include FirstAction
+      include LastAction
       include ApiControllerConcerns::ExceptionHandling
     end
   end

data/app/controllers/api/service_controller/base.rb

@@ -8,7 +8,7 @@ module Api
           include ActionController::MimeResponds
 
           respond_to :json
-          
+
           if respond_to?(:before_action)
             before_action :initialize_service_for_create, only: [:create]
           else
@@ -17,6 +17,12 @@ module Api
         end
 
         def create
+          perform
+        end
+
+        private
+
+        def perform
           @result = @service.perform
           respond_to do |format|
             if @result.success?
@@ -27,16 +33,17 @@ module Api
           end
         end
 
-        private
-
         def initialize_service_for_create
+          @service = service_class.new(*service_arguments)
+        end
+
+        def service_arguments
           # In rails 5 permitted_params is an instance of ActionController::Parameters.
           # Stragely, when calling #delete on it, it does not delete the key, so we have
-          # to transform it into a hash first. 
+          # to transform it into a hash first.
           params_hash = permitted_params.try(:to_h).presence || permitted_params
-          
           options = params_hash.try(:delete, :options) || {}
-          @service = service_class.new(params_hash, options)
+          [params_hash, options]
         end
 
         def permitted_params

data/app/controllers/service_controller/base.rb

@@ -24,16 +24,20 @@ module ServiceController
       def new; end
       
       def create
-        @response = @resource.perform
-        if @response.success?
+        perform
+      end
+
+      private
+
+      def perform
+        @result = @resource.perform
+        if @result.success?
           render :create
         else
           render :new
         end
       end
 
-      private
-
       def initialize_service
         @resource = service_class.new
       end
@@ -132,4 +136,4 @@ module ServiceController
     include ResourceInflections
     include LocationHistory
   end
-end
+end

data/app/parsers/api/resources_controller/condition_parser.rb

@@ -52,7 +52,7 @@ module Api
       end
 
       def extract_column_and_operator(string)
-        if string =~ /([a-z_]{1,})\(([a-z_]{2,})\)/
+        if string =~ /([\.a-z_]{1,})\(([a-z_]{2,})\)/
           return $~[1], $~[2]
         end 
       end

data/app/services/rails/add_ons/service/base.rb

@@ -3,6 +3,7 @@ module Rails
     module Service
       class Base
         include ActiveModel::Model
+        extend ActiveModel::Naming
 
         def self.attr_accessor(*args)
           super
@@ -19,10 +20,6 @@ module Rails
           (@attr_names ||= [])
         end
 
-        def self.i18n_scope
-          :activerecord
-        end
-
         def self.call(*args)
           new(*args).perform
         end
@@ -149,7 +146,7 @@ module Rails
         include Errors
         include Resultable
         include Callbacks
-        include Messages
+        include Rails::AddOns::Service::Messages
       end
     end
   end

data/app/services/rails/add_ons/service/messages.rb

@@ -0,0 +1,44 @@
+module Rails
+  module AddOns
+    module Service
+        module Messages
+          private
+
+          def initialize_messages
+            @messages = []
+          end
+
+          def say(what, &block)
+            @indent ||= 0
+            if block_given?
+              @indent += 1
+              output "#{output_prefix}#{("  " * @indent)}#{what}..."
+              block_result = yield
+              say_done
+              @indent -= 1
+              block_result
+            else
+              output "#{output_prefix}#{("  " * @indent)}#{what}"
+            end
+          end
+
+          def say_done
+            say "  => Done"
+          end
+
+          def output_prefix
+            "[#{self.class.name}] "
+          end
+
+          def output(what)
+            @messages << what
+            puts what
+          end
+
+          def copy_messages_to_result
+            @result.instance_variable_set(:@messages, @messages)
+          end
+        end
+      end
+    end
+  end

data/app/views/layouts/rails/add_ons/application.haml

@@ -1,6 +1,7 @@
 !!!
 %html{:lang => "en"}
   %head
+    = render 'before_head'
     = csrf_meta_tags
 
     / Required meta tags
@@ -8,16 +9,19 @@
     %meta{:content => "width=device-width, initial-scale=1, shrink-to-fit=no", :name => "viewport"}/
     / Bootstrap CSS
     %link{:crossorigin => "anonymous", :href => "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css", :integrity => "sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ", :rel => "stylesheet"}/
-    = stylesheet_link_tag    "rails/add_ons/application",  media: 'all', :'data-turbolinks-track' => 'reload'
+    = stylesheet_link_tag    "rails/add_ons/application",   media: 'all', :'data-turbolinks-track' => 'reload'
     = stylesheet_link_tag    "rails/add_ons/font_awesome",  media: 'all', :'data-turbolinks-track' => 'reload'
     = javascript_include_tag "rails/add_ons/application", :'data-turbolinks-track' => 'reload'
     / widget endpoint
     - if respond_to?(:rails_add_ons)
       %meta{name: 'widget-base-path', content: rails_add_ons.widget_path}
+    = render 'after_head'
   %body
+    = render 'before_body'
     = render 'navbar'
     .container-fluid
       .starter-template
         = bootstrap_flash
         = yield
-    / /.container
+    / /.container
+    = render 'after_body'

data/app/views/service_controller/base/create.haml

@@ -1,13 +1,13 @@
-= render 'create_before_service_output', response: @response
+= render 'create_before_service_output', result: @result
 
 %table.table.table-sm.table-striped.table-monospaced
   %tbody
-    - @response.messages.each_with_index do |message, index|
+    - @result.messages.each_with_index do |message, index|
       %tr
         %td= index + 1
         %td= message
 
-= render 'create_after_service_output', response: @response
+= render 'create_after_service_output', result: @result
 
 = bootstrap_button(to: new_resource_path, context: :success) do
   = fa_icon :back

data/config/locales/de.yml

@@ -15,6 +15,9 @@ de:
       destroy:
         notice: "%{resource_name} wurde gelöscht."
         alert: "%{resource_name} konnte nicht gelöscht werden."
+      perform:
+        notice: "%{resource_name} wurde ausgeführt."
+        alert: "%{resource_name} konnte nicht ausgeführt werden. Es traten folgende Fehler auf: %{errors}"
   i18n:
     locales:
       en: English
@@ -36,4 +39,8 @@ de:
       create:
         back: "Zurück"
       new:
-        title: "%{service_name} ausführen"
+        title: "%{service_name} ausführen"
+  views:
+    pagination:
+      last: '▶'
+      next: '◀'

data/config/locales/en.yml

@@ -15,6 +15,9 @@ en:
       destroy:
         notice: "%{resource_name} was successfully destroyed."
         alert: "%{resource_name} could not be destroyed."
+      perform:
+        notice: "%{resource_name} was executed."
+        alert: "%{resource_name} could not be executed. Errors: %{errors}"
   i18n:
     locales:
       de: Deutsch
@@ -36,4 +39,8 @@ en:
       create:
         back: "Back"
       new:
-        title: "Run %{service_name}"
+        title: "Run %{service_name}"
+  views:
+    pagination:
+      last: '▶'
+      next: '◀'

data/lib/active_model/model.rb

@@ -0,0 +1,98 @@
+module ActiveModel
+
+  # == Active Model Basic Model
+  #
+  # Includes the required interface for an object to interact with
+  # <tt>ActionPack</tt>, using different <tt>ActiveModel</tt> modules.
+  # It includes model name introspections, conversions, translations and
+  # validations. Besides that, it allows you to initialize the object with a
+  # hash of attributes, pretty much like <tt>ActiveRecord</tt> does.
+  #
+  # A minimal implementation could be:
+  #
+  #   class Person
+  #     include ActiveModel::Model
+  #     attr_accessor :name, :age
+  #   end
+  #
+  #   person = Person.new(name: 'bob', age: '18')
+  #   person.name # => 'bob'
+  #   person.age  # => 18
+  #
+  # Note that, by default, <tt>ActiveModel::Model</tt> implements <tt>persisted?</tt>
+  # to return +false+, which is the most common case. You may want to override
+  # it in your class to simulate a different scenario:
+  #
+  #   class Person
+  #     include ActiveModel::Model
+  #     attr_accessor :id, :name
+  #
+  #     def persisted?
+  #       self.id == 1
+  #     end
+  #   end
+  #
+  #   person = Person.new(id: 1, name: 'bob')
+  #   person.persisted? # => true
+  #
+  # Also, if for some reason you need to run code on <tt>initialize</tt>, make
+  # sure you call +super+ if you want the attributes hash initialization to
+  # happen.
+  #
+  #   class Person
+  #     include ActiveModel::Model
+  #     attr_accessor :id, :name, :omg
+  #
+  #     def initialize(attributes={})
+  #       super
+  #       @omg ||= true
+  #     end
+  #   end
+  #
+  #   person = Person.new(id: 1, name: 'bob')
+  #   person.omg # => true
+  #
+  # For more detailed information on other functionalities available, please
+  # refer to the specific modules included in <tt>ActiveModel::Model</tt>
+  # (see below).
+  module Model
+    def self.included(base) #:nodoc:
+      base.class_eval do
+        extend  ActiveModel::Naming
+        extend  ActiveModel::Translation
+        include ActiveModel::Validations
+        include ActiveModel::Conversion
+      end
+    end
+
+    # Initializes a new model with the given +params+.
+    #
+    #   class Person
+    #     include ActiveModel::Model
+    #     attr_accessor :name, :age
+    #   end
+    #
+    #   person = Person.new(name: 'bob', age: '18')
+    #   person.name # => "bob"
+    #   person.age  # => 18
+    def initialize(params={})
+      params.each do |attr, value|
+        # self.public_send("#{attr}=", value)
+        self.send("#{attr}=", value)
+      end if params
+    end
+
+    # Indicates if the model is persisted. Default is +false+.
+    #
+    #  class Person
+    #    include ActiveModel::Model
+    #    attr_accessor :id, :name
+    #  end
+    #
+    #  person = Person.new(id: 1, name: 'bob')
+    #  person.persisted? # => false
+    def persisted?
+      false
+    end
+  end
+end

data/lib/rails/add_ons/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module AddOns
-    VERSION = '0.2.0'
+    VERSION = '0.3.0'
   end
 end

data/lib/rails-add_ons.rb

@@ -4,5 +4,6 @@ require 'twitter_bootstrap_components_rails'
 require 'simple_form'
 require 'responders' if Rails::VERSION::MAJOR > 3
 require 'rails-i18n'
+require 'active_model/model' if Rails::VERSION::MAJOR < 4
 
 require 'rails/add_ons'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-add_ons
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,9 +202,14 @@ files:
 - app/helpers/rails/add_ons/widget_helper.rb
 - app/parsers/api/resources_controller/condition_parser.rb
 - app/services/rails/add_ons/service/base.rb
+- app/services/rails/add_ons/service/messages.rb
 - app/services/rails/add_ons/service/result/base.rb
 - app/views/component/_collection_table.haml
 - app/views/component/_resource_table.haml
+- app/views/frontend/_after_body.haml
+- app/views/frontend/_after_head.haml
+- app/views/frontend/_before_body.haml
+- app/views/frontend/_before_head.haml
 - app/views/frontend/_navbar.haml
 - app/views/layouts/rails/add_ons/application.haml
 - app/views/resources_controller/base/_after_show_table.haml
@@ -236,6 +241,7 @@ files:
 - config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb
+- lib/active_model/model.rb
 - lib/rails-add_ons.rb
 - lib/rails/add_ons.rb
 - lib/rails/add_ons/engine.rb