oxymoron 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1aebed8d250f7ed6f893a2562ceccd8526d23d4
-  data.tar.gz: d2807e171b9724dd518495790105edbec6591251
+  metadata.gz: 9bc0b4a2bc12a7d9377e2f4dc90ea3d045eb85ae
+  data.tar.gz: 43859c4cfa58dc84c60fc95d34eb5474d03969e6
 SHA512:
-  metadata.gz: 0a9df72d98dbbb29b9279b740f689ccc552874325f6e763b2f7ec5271351d5028ee4edae21e8c32ca4177e1418320f6da32bdc625ad2e0d5084503bd53f30b3a
-  data.tar.gz: 9618f50e6826f690ad841a4abea6d88309803c26dc10d20b8dce03142339073f2a2f96c2d57ccac0d36e500c8ae2c105ea068254e4444bdb8460bb6569d0bec1
+  metadata.gz: 92457106bff8e557875a22fea33e90393cbf8c03eabff082bcbfee16866b16ed9f266df74fee89609c88bce25396895668a4aff0adaa2edfa4386459bf77e338
+  data.tar.gz: 037d991888c83b6bc7ae5420c098ea8c72e92f6c184b453d83f540a2ae35f5ab1ff67e95a47ae4343ce2defa0a748ab4f331fce415caf13188a4838c039d4a96

data/LICENCE

@@ -0,0 +1,9 @@
+The MIT License (MIT)
+Copyright (c) 2016, Kononenko Pavel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/README.RU.md

@@ -31,6 +31,24 @@ gem "oxymoron", git: "https://github.com/storuky/oxymoron.git", branch: :master
  */
 ```
 
+## Дополнительные настройки
+
+
+**config/initializers/oxymoron.rb**
+```
+Oxymoron::Config.setup do |c|
+  # изменить путь сохранения генерируемого oxymoron.js
+  c.oxymoron_js_path = Rails.root.join('app', 'assets', 'javascripts', 'public') 
+  
+  # Изменить конструктор форм. По умолчанию используется OxymoronFormBuilder
+  c.form_builder = MyFormBuilder 
+  
+  # Запретить переопределение form_for из ActionView::FormHelper. В этом случае используйте хэлперы oxymoron_form_for и oxymoron_field_for
+  c.rewrite_form_for = false 
+end
+```
+
+
 ##Использование
 
 Далее необходимо заинжектить 'oxymoron' и 'ui.router' в ваше AngularJS-приложение

data/README.md

@@ -33,6 +33,23 @@ Add dependencies to your application.js and application.css
  */
 ```
 
+## Advanced settings
+
+
+**config/initializers/oxymoron.rb**
+```
+Oxymoron::Config.setup do |c|
+  # change path for generated oxymoron.js
+  c.oxymoron_js_path = Rails.root.join('app', 'assets', 'javascripts', 'public') 
+  
+  # Change form builder. By default used OxymoronFormBuilder
+  c.form_builder = MyFormBuilder 
+  
+  # Disabled rewrite form_for method in ActionView::FormHelper. In this case use helpers oxymoron_form_for and oxymoron_field_for
+  c.rewrite_form_for = false 
+end
+```
+
 ##Usage
 
 Next, you need to inject required modules 'oxymoron' and 'ui.router'

data/app/assets/javascripts/oxymoron/notifier.js.erb

@@ -7,18 +7,10 @@ angular.module("oxymoron.notifier", [])
         type: 'info'
     });
 
-    $rootScope.$on('loading:finish', function (h, res) {
-      callback('success', res)
-    })
-
-    $rootScope.$on('loading:error', function (h, res, p) {
-      callback('error', res)
-    })
-
-    function callback (type, res) {
+    $rootScope.notify_callback = function(type, res) {
       if (res.data && angular.isObject(res.data)) {
-        if (res.data.msg) {
-          ngNotify.set(res.data.msg, type);
+        if (res.data.msg || res.data.error) {
+          ngNotify.set(res.data.msg || res.data.error, type);
         }
 
         if (res.data.errors) {
@@ -36,4 +28,14 @@ angular.module("oxymoron.notifier", [])
         }
       }
     }
+
+    $rootScope.$on('loading:finish', function (h, res) {
+      $rootScope.notify_callback('success', res)
+    })
+
+    $rootScope.$on('loading:error', function (h, res, p) {
+      $rootScope.notify_callback('error', res)
+    })
+
+
   }])

data/app/assets/javascripts/oxymoron/services/resources.js.erb

@@ -7,6 +7,6 @@ angular.module("oxymoron.services.resources", [])
 
   <% @resources.each do |key, value| %>
     .factory('<%= key %>', ['$resource', 'resourceDecorator', function ($resource, resourceDecorator) {
-      return resourceDecorator($resource('<%= value[:url] %>.json', <%= value[:default_params].to_json%>, <%= value[:actions].to_json %>));
+      return resourceDecorator($resource('<%= value[:url] %>.json', <%= value[:default_params].to_json%>, <%= JSON.pretty_generate(value[:actions]).split("\n").map{|l| (' ' * 6) + l}.join("\n").strip %>));
     }])
   <% end %>

data/lib/oxymoron.rb

@@ -1,4 +1,7 @@
 if defined?(::Rails)
+  require "oxymoron/oxymoron_form_builder"
+  require "oxymoron/config"
+  require "oxymoron/extensions/form_helper"
   require "oxymoron/engine"
 end
 
@@ -9,7 +12,7 @@ module Oxymoron
       Rails.application.reload_routes!
       @routes, @states, @resources = {}, {}, {}
       
-      @app_routes = Rails.application.routes.routes.select{|route| route.name.present? && route.constraints[:request_method]}
+      @app_routes = Rails.application.routes.routes.select{|route| route.name.present? && route.verb}
       @app_routes_by_controller = @app_routes.select{|route| ['new', 'edit', 'show', 'index'].exclude?(route.defaults[:action])}.group_by{|route| route.defaults[:controller]}.delete_if {|k,v| k.nil?}
       
       @app_routes.each do |route|
@@ -29,7 +32,7 @@ module Oxymoron
     end
 
     def set_states route
-      if route.constraints[:request_method].match("GET")
+      if route.verb.match("GET")
         path = route.path.spec.to_s.gsub('(.:format)', '')
         url_matcher = "'#{path}'"
 
@@ -84,7 +87,7 @@ module Oxymoron
               for_hash[route.defaults[:action]] ||= {
                 url: route.path.spec.to_s.gsub('(.:format)', '.json'),
                 isArray: route.defaults[:is_array],
-                method: /GET|POST|PUT|PATCH|DELETE/.match(route.constraints[:request_method].to_s).to_s
+                method: /GET|POST|PUT|PATCH|DELETE/.match(route.verb.to_s).to_s
               }
             end
             

data/lib/oxymoron/config.rb

@@ -0,0 +1,20 @@
+module Oxymoron
+
+  class Config
+    class << self
+
+      attr_accessor :oxymoron_js_path
+      attr_accessor :rewrite_form_for
+      attr_accessor :form_builder
+
+      def setup
+        yield self
+      end
+
+    end
+    @rewrite_form_for = true
+    @form_builder = OxymoronFormBuilder
+
+  end
+
+end

data/lib/oxymoron/engine.rb

@@ -2,10 +2,22 @@ require 'oxymoron/concern'
 
 module Oxymoron
   class Engine < ::Rails::Engine
-
     initializer 'oxymoron.dependent_on_routes', after: "sprockets.environment" do
       Rails.application.config.after_initialize do
-        JS_ASSETS_PATH = Rails.root.join('app', 'assets', 'javascripts')
+
+        if Config.rewrite_form_for
+          ActionView::Base.send :include, ActionViewExtensions::FormHelperRewrite
+        end
+
+        ActionView::Base.send :include, ActionViewExtensions::FormHelper
+
+        module ActionView::Helpers
+          class FormBuilder
+            include ActionViewExtensions::FormBuilder
+          end
+        end
+
+        Config.oxymoron_js_path ||= Rails.root.join('app', 'assets', 'javascripts')
         routes_watch unless Rails.env.production?
         write_assets
       end
@@ -29,7 +41,7 @@ module Oxymoron
       end
 
       def write_assets
-        File.write(JS_ASSETS_PATH.join("oxymoron.js"), Oxymoron.generate("oxymoron.js.erb"))
+        File.write(File.join(Config.oxymoron_js_path, "oxymoron.js"), Oxymoron.generate("oxymoron.js.erb"))
       end
   end
 end

data/lib/oxymoron/extensions/form_helper.rb

@@ -0,0 +1,82 @@
+module Oxymoron
+  module ActionViewExtensions
+
+    module FormHelperRewrite
+      def form_for(record, options = {}, &block)
+        raise ArgumentError, "Missing block" unless block_given?
+        options[:html] ||= {}
+        html_options = options[:html].with_indifferent_access
+
+        case record
+        when String, Symbol
+          object_name = record
+          object      = nil
+        else
+          object      = record.is_a?(Array) ? record.last : record
+          raise ArgumentError, "First argument in form cannot contain nil or be empty" unless object
+          object_name = options[:as] || model_name_from_record_or_class(object).param_key
+          apply_form_for_options!(record, object, options)
+        end
+
+        html_options[:data]   = options.delete(:data)   if options.has_key?(:data)
+        html_options[:remote] = options.delete(:remote) if options.has_key?(:remote)
+        html_options[:method] = options.delete(:method) if options.has_key?(:method)
+        html_options[:enforce_utf8] = options.delete(:enforce_utf8) if options.has_key?(:enforce_utf8)
+        html_options[:authenticity_token] = options.delete(:authenticity_token)
+
+        builder = instantiate_builder(object_name, object, options)
+        output  = capture(builder, &block)
+        html_options[:multipart] ||= builder.multipart?
+        prefix = html_options["ng-submit-prefix"] || options[:prefix] || 'ctrl'
+        html_options["ng-submit"] ||= "formQuery = #{prefix}.save({form_name: '#{object_name}', id: #{prefix}.#{object_name}.id, #{object_name}: #{prefix}.#{object_name}}); $event.preventDefault();"
+
+        html_options[:name] ||= object_name
+
+        html_options = html_options_for_form(options[:url] || {}, html_options)
+        form_tag_with_body(html_options, output)
+      end
+    end
+
+
+    module FormHelper
+
+      def oxymoron_form_for(record, options = {}, &block)
+        options[:builder] ||= Config.form_builder
+
+        case record
+        when String, Symbol
+          object_name = record
+        else
+          object      = record.is_a?(Array) ? record.last : record
+          raise ArgumentError, "First argument in form cannot contain nil or be empty" unless object
+          object_name = options[:as] || model_name_from_record_or_class(object).param_key
+        end
+
+        html_options = options[:html] ||= {}
+        html_options[:name] ||= object_name
+        prefix = html_options["ng-submit-prefix"] || options[:prefix] || 'ctrl'
+        html_options["ng-submit"] ||= "formQuery = #{prefix}.save({form_name: '#{object_name}', id: #{prefix}.#{object_name}.id, #{object_name}: #{prefix}.#{object_name}}); $event.preventDefault();"
+
+        options[:html].merge!(html_options)
+        form_for record, options, &block
+      end
+
+      def oxymoron_fields_for(record_name, record_object = nil, options = {}, &block)
+        options[:builder] ||= Config.form_builder
+        fields_for record_name, record_object, options, &block
+      end
+
+    end
+
+    module FormBuilder
+
+      def oxymoron_fields_for(record_name, record_object = nil, fields_options = {}, &block)
+        options[:builder] ||= Config.form_builder
+        fields_for record_name, record_object, fields_options, &block
+      end
+
+    end
+
+  end
+end
+

data/lib/oxymoron/version.rb

@@ -1,3 +1,3 @@
 module Oxymoron
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxymoron
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kononenko Paul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -90,6 +90,7 @@ files:
 - ".DS_Store"
 - ".gitignore"
 - Gemfile
+- LICENCE
 - MIT-LICENSE
 - README.RU.md
 - README.md
@@ -116,12 +117,13 @@ files:
 - app/assets/javascripts/oxymoron/services/sign.js
 - app/assets/javascripts/oxymoron/services/validate.js
 - app/assets/javascripts/oxymoron/states.js.erb
-- app/helpers/form_helper.rb
-- app/helpers/oxymoron_form_builder.rb
 - lib/.DS_Store
 - lib/oxymoron.rb
 - lib/oxymoron/concern.rb
+- lib/oxymoron/config.rb
 - lib/oxymoron/engine.rb
+- lib/oxymoron/extensions/form_helper.rb
+- lib/oxymoron/oxymoron_form_builder.rb
 - lib/oxymoron/version.rb
 - lib/tasks/oxymoron_tasks.rake
 - oxymoron.gemspec
@@ -958,7 +960,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: It's using AngularJS and Rails >= 4.2

data/app/helpers/form_helper.rb

@@ -1,35 +0,0 @@
-module FormHelper
-  def form_for(record, options = {}, &block)
-    raise ArgumentError, "Missing block" unless block_given?
-    options[:html] ||= {}
-    html_options = options[:html].with_indifferent_access
-
-    case record
-    when String, Symbol
-      object_name = record
-      object      = nil
-    else
-      object      = record.is_a?(Array) ? record.last : record
-      raise ArgumentError, "First argument in form cannot contain nil or be empty" unless object
-      object_name = options[:as] || model_name_from_record_or_class(object).param_key
-      apply_form_for_options!(record, object, options)
-    end
-
-    html_options[:data]   = options.delete(:data)   if options.has_key?(:data)
-    html_options[:remote] = options.delete(:remote) if options.has_key?(:remote)
-    html_options[:method] = options.delete(:method) if options.has_key?(:method)
-    html_options[:enforce_utf8] = options.delete(:enforce_utf8) if options.has_key?(:enforce_utf8)
-    html_options[:authenticity_token] = options.delete(:authenticity_token)
-
-    builder = instantiate_builder(object_name, object, options)
-    output  = capture(builder, &block)
-    html_options[:multipart] ||= builder.multipart?
-    prefix = html_options["ng-submit-prefix"] || 'ctrl'
-    html_options["ng-submit"] ||= "formQuery = #{prefix}.save({form_name: '#{object_name}', id: #{prefix}.#{object_name}.id, #{object_name}: #{prefix}.#{object_name}}); $event.preventDefault();"
-
-    html_options[:name] ||= object_name
-
-    html_options = html_options_for_form(options[:url] || {}, html_options)
-    form_tag_with_body(html_options, output)
-  end
-end