mage 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee6cc104ead51cc80be0ce731c7df0abdb4fea50
-  data.tar.gz: a4c5d78f2cd94d0dbf668084b6c2ff63ab89a4e1
+  metadata.gz: ecf49becdb6d43257e9b308f7ee53114662c39f1
+  data.tar.gz: 0ed26162e3e5e53a9d604cf3bfd9919873744178
 SHA512:
-  metadata.gz: 37b60906f794dc7b1ced6b405ee565d9c4ab8c53db5b228b3a32f8ec6ec87f20a3f6f5347a1f7957bc2cf145eef3cde07da7dfd87e507f028d31180983115041
-  data.tar.gz: a9d8ef8f5ce5f7195fb22b576d6abc43b22ced8127f24aa952c9ec3e5cc545510ff51e6688c33c59d79ab5d91e1ad93d5cc6c9a1df595cc2e42d3a6101fef401
+  metadata.gz: 74c083341de4cf56d0c6249e65cf8e3a87dcc5ebec566c84a0b3e80f1e81c2da0d42c03356aeb5a1d714b7d493d68bbb3f2b9421cd2f06499e1949ee25665f38
+  data.tar.gz: 8b85ab4347022b0ad8754d58ca9421cb265244cc60d764de51271510d5b17ff5ab670c1c288db514cd9f20b0b4e36f7b3035f6eeeb03cff15ac697cbd31faaf8

data/README.md

@@ -14,7 +14,11 @@ And then execute:
 
     $ bundle install
 
-After that migrate your database:
+After that generate migration:
+
+    $ rails g mage
+
+And migrate your database:
 
     $ rake db:migrate
 
@@ -103,7 +107,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/effect
 
 I think there's a lot of stuff to do. Here's just examples:
 * ~~Keep flash messages if showing step~~
-* Generator
+* ~~Generator~~
 * Tests
 
 ## License

data/lib/generators/mage/mage_generator.rb

@@ -0,0 +1,22 @@
+require 'rails/generators'
+require 'rails/generators/migration'
+
+class MageGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+
+  def self.source_root
+    @source_root ||= File.dirname(__FILE__)
+  end
+
+  def self.next_migration_number(dirname)
+    if ActiveRecord::Base.timestamped_migrations
+      Time.new.utc.strftime("%Y%m%d%H%M%S")
+    else
+      "%.3d" % (current_migration_number(dirname) + 1)
+    end
+  end
+
+  def create_migration_file
+    migration_template 'active_record_migration.rb', 'db/migrate/create_mage_steps.rb'
+  end
+end

data/lib/mage.rb

@@ -1,83 +1,7 @@
 require 'mage/version'
+require 'mage/mage_step'
+require 'mage/active_record_patch'
+require 'mage/action_controller_patch'
 
-module Mage
-  class WizardRendered < Exception
-  end
 
-  class MageStep < ActiveRecord::Base
-    belongs_to :object, polymorphic: true
-  end
-end
-
-class ActiveRecord::Base
-  def self.has_mage_steps(*steps)
-    @@mage_steps = steps
-    after_save :mage_after_save
-    after_destroy { Mage::MageStep.where(object_id: self.id, object_type: self.model_name.name).try(:take).try(:destroy) }
-
-    define_method :mage_steps do
-      @@mage_steps
-    end
-
-    instance_eval do
-      define_method :mage_step do
-        Mage::MageStep.where(object_id: self.id, object_type: self.model_name.name)
-            .try(:take).try(:step).try(:to_sym) || @@mage_steps.first
-      end
-
-      steps.each_with_index do |step, index|
-        define_method "mage_step_#{step}?" do
-          index <= (@@mage_steps.find_index(mage_step) || @@mage_steps.count)
-        end
-      end
-
-      define_method :mage_after_save do
-        if mage_step != :done
-          mage_model = Mage::MageStep.where(object_id: id, object_type: model_name.name).try(:take) ||
-              Mage::MageStep.create(object_id: id, object_type: model_name.name, step: mage_step)
-          mage_model.update(step: (@@mage_steps[@@mage_steps.find_index(mage_step) + 1] || :done))
-        end
-      end
-
-      private :mage_after_save
-
-    end
-  end
-end
-
-class ActionController::Base
-  rescue_from Mage::WizardRendered, with: :mage_return
-
-  def render_mage(object, options = {})
-    puts "#{object}"
-    unless object.mage_step == :done
-      if request.method == 'GET'
-        if options[:show_step] && params[:step].blank?
-          mage_redirect(object, options[:show_step])
-        else
-          if flash["#{object.model_name.name.downcase}_errors"]
-            flash["#{object.model_name.name.downcase}_errors"].each do |attribute, errors|
-              errors.each { |error| object.errors[attribute] << error }
-            end
-          end
-          render "#{params[:controller]}/steps/#{object.mage_step}"
-        end
-      else
-        mage_redirect(object, options[:show_step])
-      end
-      raise Mage::WizardRendered.new
-    end
-  end
-
-  def mage_redirect(object, show_step = false)
-    flash["#{object.model_name.name.downcase}_errors"] = object.errors.messages
-    path = object.new_record? ? :new_polymorphic_path : :edit_polymorphic_path
-    redirect_to send(path, object, step: (object.mage_step if show_step))
-  end
-
-  def mage_return
-  end
-
-  private :mage_return, :mage_redirect
-end
 

data/lib/mage/action_controller_patch.rb

@@ -0,0 +1,40 @@
+module Mage
+  class WizardRendered < Exception
+  end
+end
+
+class ActionController::Base
+  rescue_from Mage::WizardRendered, with: :mage_return
+
+  def render_mage(object, options = {})
+    puts "#{object}"
+    unless object.mage_step == :done
+      if request.method == 'GET'
+        if options[:show_step] && params[:step].blank?
+          mage_redirect(object, options[:show_step])
+        else
+          if flash["#{object.model_name.name.downcase}_errors"]
+            flash["#{object.model_name.name.downcase}_errors"].each do |attribute, errors|
+              errors.each { |error| object.errors[attribute] << error }
+            end
+          end
+          render "#{params[:controller]}/steps/#{object.mage_step}"
+        end
+      else
+        mage_redirect(object, options[:show_step])
+      end
+      raise Mage::WizardRendered.new
+    end
+  end
+
+  def mage_redirect(object, show_step = false)
+    flash["#{object.model_name.name.downcase}_errors"] = object.errors.messages
+    path = object.new_record? ? :new_polymorphic_path : :edit_polymorphic_path
+    redirect_to send(path, object, step: (object.mage_step if show_step))
+  end
+
+  def mage_return
+  end
+
+  private :mage_return, :mage_redirect
+end

data/lib/mage/active_record_patch.rb

@@ -0,0 +1,35 @@
+class ActiveRecord::Base
+  def self.has_mage_steps(*steps)
+    @@mage_steps = steps
+    after_save :mage_after_save
+    after_destroy { Mage::MageStep.where(object_id: self.id, object_type: self.model_name.name).try(:take).try(:destroy) }
+
+    define_method :mage_steps do
+      @@mage_steps
+    end
+
+    instance_eval do
+      define_method :mage_step do
+        Mage::MageStep.where(object_id: self.id, object_type: self.model_name.name)
+            .try(:take).try(:step).try(:to_sym) || @@mage_steps.first
+      end
+
+      steps.each_with_index do |step, index|
+        define_method "mage_step_#{step}?" do
+          index <= (@@mage_steps.find_index(mage_step) || @@mage_steps.count)
+        end
+      end
+
+      define_method :mage_after_save do
+        if mage_step != :done
+          mage_model = Mage::MageStep.where(object_id: id, object_type: model_name.name).try(:take) ||
+              Mage::MageStep.create(object_id: id, object_type: model_name.name, step: mage_step)
+          mage_model.update(step: (@@mage_steps[@@mage_steps.find_index(mage_step) + 1] || :done))
+        end
+      end
+
+      private :mage_after_save
+
+    end
+  end
+end

data/lib/mage/mage_step.rb

@@ -0,0 +1,5 @@
+module Mage
+  class MageStep < ActiveRecord::Base
+    belongs_to :object, polymorphic: true
+  end
+end

data/lib/mage/version.rb

@@ -1,3 +1,3 @@
 module Mage
-  VERSION = '0.1.1'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mage
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Viacheslav Mefodin
@@ -70,8 +70,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- db/migrate/20160407080915_create_mage_steps.rb
+- lib/generators/mage/active_record_migration.rb
+- lib/generators/mage/mage_generator.rb
 - lib/mage.rb
+- lib/mage/action_controller_patch.rb
+- lib/mage/active_record_patch.rb
+- lib/mage/mage_step.rb
 - lib/mage/version.rb
 - mage.gemspec
 homepage: https://github.com/effect305/mage