activeadmin-poro-decorator 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f812d5409d60050f58427243a77a0cf1d2f97e
-  data.tar.gz: d2ada57dc5c19e865bcc03c7a01fdfbb0f8bc9dd
+  metadata.gz: 7e9f07ed03e9c43c64bb5f99cced2353e68f123e
+  data.tar.gz: 82a8836d3d5d0e1fcc0329d44af87c74effb17be
 SHA512:
-  metadata.gz: f0f6d2b39020694f7404e66e50f6a9874cb8fabc8924e1ea0a0dfaa1b8e30a14ec877ddadd6a94a566e4987d93c374a9931663d8d499596a2f08605a6c0365d8
-  data.tar.gz: db7dc203bba84a74b2c63fc1e3586e8badcbf28ede96ae7d791f9656b63da162e5c8a91db20c1cbe25e2876e4363341a6030c1c58482402a86c585daeda07059
+  metadata.gz: c6952ebdb187fd994eb6b5c0d7422e44d2671ccb5c8035786d571565711790bcce34adee7d903022847c57c069629bfb35a7c84624f8bf3e7ca672a0bc6766fd
+  data.tar.gz: a0adceaa7e05b0d6d27ee7f1c687940d9f8010e3996270710941a9cce90ad3345ce4dcbc7c4eb27ef0bc88d0cd80610a487b7ff75cf9737a5819143687c7141e

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 2.1.4
+  - 2.2.0

data/Gemfile.lock

@@ -1,68 +1,73 @@
 PATH
   remote: .
   specs:
-    activeadmin-poro-decorator (0.1.0)
+    activeadmin-poro-decorator (0.2.0)
       rails (>= 4.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.12)
-      actionpack (= 4.0.12)
+    actionmailer (4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.12)
-      activesupport (= 4.0.12)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
+    actionpack (4.1.8)
+      actionview (= 4.1.8)
+      activesupport (= 4.1.8)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.12)
-      activesupport (= 4.0.12)
-      builder (~> 3.1.0)
-    activerecord (4.0.12)
-      activemodel (= 4.0.12)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.12)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.12)
+    actionview (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+    activerecord (4.1.8)
+      activemodel (= 4.1.8)
+      activesupport (= 4.1.8)
+      arel (~> 5.0.0)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    builder (3.1.4)
+      tzinfo (~> 1.1)
+    arel (5.0.1.20140414130214)
+    builder (3.2.2)
     coderay (1.1.0)
     database_cleaner (0.9.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     hike (1.2.3)
     i18n (0.7.0)
+    json (1.8.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
     mime-types (2.4.3)
-    minitest (4.7.5)
+    minitest (5.5.1)
     multi_json (1.10.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.0.12)
-      actionmailer (= 4.0.12)
-      actionpack (= 4.0.12)
-      activerecord (= 4.0.12)
-      activesupport (= 4.0.12)
+    rails (4.1.8)
+      actionmailer (= 4.1.8)
+      actionpack (= 4.1.8)
+      actionview (= 4.1.8)
+      activemodel (= 4.1.8)
+      activerecord (= 4.1.8)
+      activesupport (= 4.1.8)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.12)
+      railties (= 4.1.8)
       sprockets-rails (~> 2.0)
-    railties (4.0.12)
-      actionpack (= 4.0.12)
-      activesupport (= 4.0.12)
+    railties (4.1.8)
+      actionpack (= 4.1.8)
+      activesupport (= 4.1.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
@@ -84,7 +89,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -92,7 +97,8 @@ GEM
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    tzinfo (0.3.42)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,5 +1,7 @@
 # Activeadmin Poro Decorator
 
+![](https://travis-ci.org/kiote/activeadmin-poro-decorator.svg?branch=master)
+
 Alternative for draper, if you need decorators at ActiveAdmin (and Rails).
 Active Admin uses the Draper gem for [decorators](http://activeadmin.info/docs/11-decorators.html), but sometimes you don't need that.
 For reasons you could read this article: http://thepugautomatic.com/2014/03/draper.
@@ -51,12 +53,13 @@ end
 class PostDecorator < DelegateClass(Post)
   include ActiveadminPoroDecorator
 
-  def self.model_name
-    ActiveModel::Name.new Post
-  end
+  class << self
+    delegate :all, :arel_table, :find_by_sql, :columns, :connection,\
+             :unscoped, :table_name, :primary_key, to: Post
 
-  def self.columns
-    Post.columns
+    def model_name
+      ActiveModel::Name.new Post
+    end
   end
 
   def hello
@@ -71,6 +74,11 @@ end
 
 For more examples have a look to [sample app](https://github.com/kiote/aa_plus_poro)
 
+## Credits
+![](http://d3a5orex94acl6.cloudfront.net/assets/logo-sprites-a6de3b3521c14ee436ca3207d83cdf90.png)
+
+Activeadmin-poro-decorator is created with support of [Legelisten.no](http://www.legelisten.no/om-oss)
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/activeadmin-poro-decorator/fork )

data/Rakefile

@@ -1,3 +1,6 @@
 require "bundler/gem_tasks"
 import "./lib/tasks/copy_config.rake"
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/lib/activeadmin-poro-decorator.rb

@@ -1,17 +1,7 @@
 require 'activeadmin-poro-decorator/version'
 require 'activeadmin-poro-decorator/config'
-require 'activeadmin-poro-decorator/railtie' if defined?(Rails)
-
-# monkey patch to make ActiveAdmin::Comment works with activeadmin_poro_decorator
-module ActiveAdmin
-  class Comment < ActiveRecord::Base
-    # @returns [String] The name of the record to use for the polymorphic relationship
-    def self.resource_type(resource)
-      return resource.type if resource.respond_to?(:type)
-      ResourceController::Decorators.undecorate(resource).class.name.to_s
-    end
-  end
-end
+require 'activeadmin-poro-decorator/railtie'
+require 'activeadmin-poro-decorator/comment'
 
 module ActiveadminPoroDecorator
   extend ActiveSupport::Concern
@@ -24,14 +14,44 @@ module ActiveadminPoroDecorator
     delegate :url_helpers, to: "Rails.application.routes"
   end
 
+  def decorated?
+    true
+  end
+
+  def model
+    self.class.model_name_const
+  end
+
   module ClassMethods
+    def model_name_const
+      config = Config::Reader.new
+      self.to_s.gsub(config.param('modelname'), '').constantize
+    end
+
+    # obtain original model name
+    # ArticlePresenter -> Article
+    def model_name
+      ActiveModel::Name.new model_name_const.to_s.constantize
+    end
+
+    # we need to delegate all this methods to support active record interface
+    [:all, :arel_table, :find_by_sql, :columns, :connection,\
+     :unscoped, :table_name, :primary_key].each do |delegated_method|
+      define_method(delegated_method) do |*args|
+        model_name_const.send(delegated_method, *args)
+      end
+    end
+
+    def build_default_scope
+      model_name_const.send(:build_default_scope)
+    end
+
     def decorate(*args)
       collection_or_object = args[0]
       if collection_or_object.respond_to?(:to_ary)
         # assuming we have self.model_name method in decorator implementation
         # suggested by @eyefodder
-        class_name = model_name.to_s.constantize
-        DecoratedEnumerableProxy.new(collection_or_object, class_name)
+        DecoratedEnumerableProxy.new(collection_or_object, model_name_const)
       else
         new(collection_or_object)
       end
@@ -45,7 +65,8 @@ module ActiveadminPoroDecorator
   class DecoratedEnumerableProxy < DelegateClass(ActiveRecord::Relation)
     include Enumerable
 
-    delegate :as_json, :collect, :map, :each, :[], :all?, :include?, :first, :last, :shift, :to => :decorated_collection
+    delegate :as_json, :collect, :map, :each, :[], :all?, :include?, \
+             :first, :last, :shift, to: :decorated_collection
 
     def initialize(collection, class_name)
       super(collection)

data/lib/activeadmin-poro-decorator/comment.rb

@@ -0,0 +1,15 @@
+module ActiveAdmin
+  class Comment < ActiveRecord::Base
+    # @return [String] The name of the record to use for the polymorphic relationship
+    def self.resource_type(resource)
+      # original method has 
+      # ResourceController::Decorators.undecorate(resource).class.base_class.name.to_s
+      # here, but somehow it didn't work
+      undecorated = ResourceController::Decorators.undecorate(resource)
+      if undecorated.to_s.include?(':')
+        undecorated = undecorated.class.to_s
+      end
+      undecorated.to_s
+    end
+  end
+end

data/lib/activeadmin-poro-decorator/config.rb

@@ -4,7 +4,11 @@ module ActiveadminPoroDecorator
   module Config
     class Reader
       def initialize
-        @config = YAML.load_file('config/activeadmin-poro-decorator.yml')
+        @config = if ENV['RAILS_ENV'] == 'test'
+          YAML.load_file('spec/support/dummy/config/activeadmin-poro-decorator.yml')
+        else
+          YAML.load_file('config/activeadmin-poro-decorator.yml')
+        end
       end
 
       def param(name)

data/lib/activeadmin-poro-decorator/version.rb

@@ -1,3 +1,3 @@
 module ActiveadminPoroDecorator
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/integration/article_presenter_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'ArticlePresenter' do
+  it 'delegates :all to Article' do
+    expect(ArticlePresenter.all.class).to eq(Article::ActiveRecord_Relation)
+  end
+
+  it 'builds default scope' do
+    expect(ArticlePresenter.build_default_scope).to eq nil
+  end
+end

data/spec/support/dummy/app/presenters/article_presenter.rb

@@ -2,19 +2,6 @@
 class ArticlePresenter < DelegateClass(Article)
   include ActiveadminPoroDecorator
 
-  class << self
-    delegate :all, :arel_table, :find_by_sql, :columns, :connection,\
-             :unscoped, :table_name, :primary_key, to: Article
-
-    def model_name
-      ActiveModel::Name.new Article
-    end
-
-    def build_default_scope
-      Article.send(:build_default_scope)
-    end
-  end
-  
   def hello
     "Hello, #{title}"
   end

data/spec/support/dummy/config/activeadmin-poro-decorator.yml

@@ -0,0 +1,2 @@
+modelname: Presenter
+use_helpers: true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-poro-decorator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Krivich Ekaterina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,6 +117,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -125,11 +126,12 @@ files:
 - activeadmin-poro-decorator.gemspec
 - activeadmin-poro-decorator.yml.example
 - lib/activeadmin-poro-decorator.rb
-- lib/activeadmin-poro-decorator/activeadmin_comment.rb
+- lib/activeadmin-poro-decorator/comment.rb
 - lib/activeadmin-poro-decorator/config.rb
 - lib/activeadmin-poro-decorator/railtie.rb
 - lib/activeadmin-poro-decorator/version.rb
 - lib/tasks/copy_config.rake
+- spec/integration/article_presenter_spec.rb
 - spec/integration/decorate_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy/Rakefile
@@ -139,6 +141,7 @@ files:
 - spec/support/dummy/bin/rails
 - spec/support/dummy/bin/rake
 - spec/support/dummy/config.ru
+- spec/support/dummy/config/activeadmin-poro-decorator.yml
 - spec/support/dummy/config/application.rb
 - spec/support/dummy/config/boot.rb
 - spec/support/dummy/config/database.yml
@@ -171,6 +174,7 @@ signing_key:
 specification_version: 4
 summary: Plain Old Ruby Objects as Decorators for Active Admin
 test_files:
+- spec/integration/article_presenter_spec.rb
 - spec/integration/decorate_spec.rb
 - spec/spec_helper.rb
 - spec/support/dummy/Rakefile
@@ -180,6 +184,7 @@ test_files:
 - spec/support/dummy/bin/rails
 - spec/support/dummy/bin/rake
 - spec/support/dummy/config.ru
+- spec/support/dummy/config/activeadmin-poro-decorator.yml
 - spec/support/dummy/config/application.rb
 - spec/support/dummy/config/boot.rb
 - spec/support/dummy/config/database.yml

data/lib/activeadmin-poro-decorator/activeadmin_comment.rb

@@ -1,9 +0,0 @@
-module ActiveAdmin
-  class Comment < ActiveRecord::Base
-    # @returns [String] The name of the record to use for the polymorphic relationship
-    def self.resource_type(resource)
-      return resource.type if resource.respond_to?(:type)
-      ResourceController::Decorators.undecorate(resource).class.name.to_s
-    end
-  end
-end