effective_resources 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a75f5adcc4a20f0f1a18cd2496657b439934e596
-  data.tar.gz: c72e11e7e702d75cafa264dab8c538f6e61962b1
+  metadata.gz: b55e4948a32a2526cc0ce43230a6bee620c09a14
+  data.tar.gz: d0b8bf59119514d156e4b63428cc068960cb779e
 SHA512:
-  metadata.gz: 5027571db1c5f1ebad0870f99a1606dc7bd8cc4e5282d472656f2aaf4d9d010a71d26ff7dadb55fd7386906d8eedb67fd1ee24e08e8133c07b8ec18045caf2cb
-  data.tar.gz: 96ed7d36303ad72394afa8dc2c7c6533500abca4e85fbdb56d3868b91897446f1fb36f9af4653bb6ca610c78f159a2568cb95a76cfb79248a07c027255d27808
+  metadata.gz: 508301a27e166a14290d8085066c773d584ab2e39c294106b7361d973219712f359e227178904f7f58f9849e551204d317d042d49de594f85c2417e896f818e4
+  data.tar.gz: c96b6875d7685e62b288fef2e8892eb7a1c664cfd6839ac0e491e876e103224e75d1fcced5ba2c83d427ec98322767f61fb99915ebc4f3bfd18b0da0aee9cfe5

data/app/assets/javascripts/effective_resources/effective_ujs.js

@@ -35,10 +35,10 @@
         formGroup.find('abbr').remove();
         input.parent().find('abbr').remove();
 
-        if(input.parent().is('label')) {
+        if(input.parent().is('label') && input.parent().parent().hasClass('radio') == false) {
           input.after("<abbr title='required'>*</abbr> ");
         } else if(formGroup.length > 0) {
-          formGroup.find('label').prepend("<abbr title='required'>*</abbr> ");
+          formGroup.find('label').first().prepend("<abbr title='required'>*</abbr> ");
         } else {
           input.parent().find('label').prepend("<abbr title='required'>*</abbr> ");
         }

data/app/controllers/concerns/effective/crud_controller.rb

@@ -43,10 +43,10 @@ module Effective
       EffectiveResources.authorized?(self, :create, resource)
 
       if resource.save
-        flash[:success] = "Successfully created #{resource_name}"
+        flash[:success] = "Successfully created #{resource_human_name}"
         redirect_to(resource_redirect_path)
       else
-        flash.now[:danger] = "Unable to create #{resource_name}: #{resource.errors.full_messages.to_sentence}"
+        flash.now[:danger] = "Unable to create #{resource_human_name}: #{resource.errors.full_messages.to_sentence}"
         render :new
       end
     end
@@ -72,10 +72,10 @@ module Effective
       EffectiveResources.authorized?(self, :update, resource)
 
       if resource.update_attributes(send(resource_params_method_name))
-        flash[:success] = "Successfully updated #{resource_name}"
+        flash[:success] = "Successfully updated #{resource_human_name}"
         redirect_to(resource_redirect_path)
       else
-        flash.now[:danger] = "Unable to update #{resource_name}: #{resource.errors.full_messages.to_sentence}"
+        flash.now[:danger] = "Unable to update #{resource_human_name}: #{resource.errors.full_messages.to_sentence}"
         render :edit
       end
     end
@@ -87,9 +87,9 @@ module Effective
       EffectiveResources.authorized?(self, :destroy, resource)
 
       if resource.destroy
-        flash[:success] = "Successfully deleted #{resource_name}"
+        flash[:success] = "Successfully deleted #{resource_human_name}"
       else
-        flash[:danger] = "Unable to delete #{resource_name}: #{resource.errors.full_messages.to_sentence}"
+        flash[:danger] = "Unable to delete #{resource_human_name}: #{resource.errors.full_messages.to_sentence}"
       end
 
       request.referer.present? ? redirect_to(request.referer) : redirect_to(send(resource_index_path))
@@ -132,6 +132,10 @@ module Effective
       effective_resource.name
     end
 
+    def resource_human_name
+      effective_resource.human_name
+    end
+
     def resource_plural_name # 'things'
       effective_resource.plural_name
     end

data/app/models/effective/attribute.rb

@@ -8,10 +8,6 @@ module Effective
 
       if (scanned = input.scan(/^\W*(\w+)\W*:(\w+)/).first).present?
         new(*scanned)
-      elsif input.start_with?('#')
-        new(nil)
-      else
-        new(input)
       end
     end
 

data/app/models/effective/resources/associations.rb

@@ -28,7 +28,7 @@ module Effective
 
       def nested_resources
         return [] unless klass.respond_to?(:reflect_on_all_associations)
-        @nested_resources ||= klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] }
+        @nested_resources ||= klass.reflect_on_all_associations(:has_many).select { |ass| ass.options[:autosave] && ass.options[:class_name] != 'Effective::Attachment' }
       end
 
       def scopes

data/app/models/effective/resources/init.rb

@@ -15,9 +15,13 @@ module Effective
         when String ; input
         when Symbol ; input
         when Class  ; input.name
-        when ActiveRecord::Relation ; input.klass
-        when ActiveRecord::Reflection::AbstractReflection ; input.name
-        when ActionDispatch::Journey::Route ; input.defaults[:controller]
+        when ActiveRecord::Relation
+          input.klass
+        when ActiveRecord::Reflection::AbstractReflection
+          @model_klass = input.klass
+          input.name
+        when ActionDispatch::Journey::Route
+          input.defaults[:controller]
         when nil    ; raise 'expected a string or class'
         else        ; input.class.name
         end.to_s.underscore
@@ -48,6 +52,7 @@ module Effective
 
           if first && last
             @written_attributes = reader.select(from: first+1, to: last-1).map do |line|
+
               Effective::Attribute.parse_written(line).presence
             end.compact
           end

data/app/models/effective/resources/naming.rb

@@ -32,7 +32,7 @@ module Effective
       end
 
       def human_name
-        class_name.gsub('::', ' ')
+        class_name.gsub('::', ' ').underscore.gsub('_', ' ')
       end
 
     end

data/app/models/effective/resources/paths.rb

@@ -3,24 +3,41 @@ module Effective
     module Paths
 
       # Controller REST helper paths
-      def index_path
-        [namespace, plural_name, 'path'].compact * '_'
+      def index_path(check: false)
+        path = [namespace, plural_name, 'path'].compact * '_'
+        path if (!check || path_exists?(path))
       end
 
-      def new_path
-        ['new', namespace, name, 'path'].compact * '_'
+      def new_path(check: false)
+        path = ['new', namespace, name, 'path'].compact * '_'
+        path if (!check || path_exists?(path))
       end
 
-      def show_path
-        [namespace, name, 'path'].compact * '_'
+      def show_path(check: false)
+        path = [namespace, name, 'path'].compact * '_'
+        path if (!check || path_exists?(path, 1))
       end
 
-      def edit_path
-        ['edit', namespace, name, 'path'].compact * '_'
+      def destroy_path(check: false)
+        path = [namespace, name, 'path'].compact * '_'
+        path if (!check || path_exists?(path, 1, :delete))
       end
 
-      def action_path(action)
-        [action, namespace, name, 'path'].compact * '_'
+      def edit_path(check: false)
+        path = ['edit', namespace, name, 'path'].compact * '_'
+        path if (!check || path_exists?(path, 1))
+      end
+
+      def action_path(action, check: false)
+        path = [action, namespace, name, 'path'].compact * '_'
+        path if (!check || path_exists?(path, 1))
+      end
+
+      def path_exists?(path, param = nil, verb = :get)
+        routes = Rails.application.routes
+
+        return false unless routes.url_helpers.respond_to?(path)
+        (routes.recognize_path(routes.url_helpers.send(path, param), method: verb).present? rescue false)
       end
 
       # _helper methods also put in the (@thing)

data/app/models/effective/resources/relation.rb

@@ -34,7 +34,8 @@ module Effective
         when :effective_roles
           relation.order("#{sql_column(:roles_mask)} #{sql_direction}")
         else
-          relation.order("#{sql_column} #{sql_direction}")
+          relation
+            .order("#{sql_column} #{sql_direction}")
         end
       end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.2.3'.freeze
+  VERSION = '0.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails