weixin_rails_middleware 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 328982300f97b4e56ae76baac5df06ae9b8e5605
-  data.tar.gz: 330a98f5c4c6b13cd86a0740b2a91cf6f2a3c4cb
+  metadata.gz: da756c0c956a72e759c9ce775f7632ba43eb0ae4
+  data.tar.gz: a9a611e9c90db9a3a2b2a2493ea3e9b1b94ed8a9
 SHA512:
-  metadata.gz: 999b82f09d4bf3cc3731e6ab1bf7dd7ad19b3183e2cbb0aef72c49c688e53065b4b201407ed28e4720e0bfd7d1f7792c6180ff20438b35aba771d239e0b646a9
-  data.tar.gz: 9f5ae33310059880dda908ad38bb7faf4aebce6763e5df0c04eb0da65cbc4c5c689a213206dc0017eb4ec2e4ecfdec3fc9cd09b088174fe029abf8efa667476d
+  metadata.gz: c51ed60641ca6bba90b2c96e3d5ce145eb35f8b919a3feac03e814c549e5f45632e9e5552764784a61705c4cc80eb9b6ac495254d43eb5c01b5246e12fb18f7b
+  data.tar.gz: e68524e8cf517e9b1653957704368dced8922f8f95a30e99b0250babff6df016dddb217a825b297a24884adb2a36b0ce513a369c0790e96426fbc3f67589f938

data/lib/generators/weixin_rails_middleware/migration_generator.rb

@@ -7,7 +7,47 @@ module WeixinRailsMiddleware
 
       desc 'Adds a Wexin Secret Key for your application.'
       def create_migration_file
-        migration_template "add_weixin_secret_key_and_weixin_token_migration.rb", "db/migrate/add_weixin_secret_key_and_weixin_token_to_#{plural_name}.rb"
+        if !migration_exists?(table_name)
+          migration_template "add_weixin_secret_key_and_weixin_token_migration.rb", "db/migrate/add_weixin_secret_key_and_weixin_token_to_#{plural_name}.rb"
+        end
+      end
+
+      def inject_model_content
+
+        content = <<-CONTENT
+  # It will auto generate weixin token and secret
+  include WeixinRailsMiddleware::AutoGenerateWeixinTokenSecretKey
+
+CONTENT
+
+        class_path = if namespaced?
+          class_name.to_s.split("::")
+        else
+          [class_name]
+        end
+
+        indent_depth = class_path.size - 1
+        content = content.split("\n").map { |line| "  " * indent_depth + line } .join("\n") << "\n"
+
+        inject_into_class(model_path, class_path.last, content) if model_exists?
+      end
+
+      private
+
+      def model_exists?
+        File.exists?(File.join(destination_root, model_path))
+      end
+
+      def model_path
+        @model_path ||= File.join("app", "models", "#{file_path}.rb")
+      end
+
+      def migration_exists?(table_name)
+        Dir.glob("#{File.join(destination_root, migration_path)}/[0-9]*_*.rb").grep(/\d+_add_weixin_secret_key_and_weixin_token_to_#{table_name}.rb/).first
+      end
+
+      def migration_path
+        @migration_path ||= File.join("db", "migrate")
       end
 
     end

data/lib/weixin_rails_middleware.rb

@@ -5,6 +5,7 @@ require "weixin_rails_middleware/models/reply_message"
 require "weixin_rails_middleware/helpers/reply_weixin_message_helper"
 require "weixin_rails_middleware/helpers/unique_token_helper"
 require "weixin_rails_middleware/helpers/weixin_authorize_helper"
+require "weixin_rails_middleware/helpers/auto_generate_weixin_token_secret_key"
 
 module WeixinRailsMiddleware
 

data/lib/weixin_rails_middleware/engine.rb

@@ -5,21 +5,5 @@ module WeixinRailsMiddleware
     isolate_namespace WeixinRailsMiddleware
     engine_name :weixin_engine
 
-    config.after_initialize do
-      token_model_callback if token_model.present?
-    end
-
-    private
-
-      def token_model_callback
-        token_model_class.class_eval do
-          before_create do
-            # TODO: refactor
-            self.weixin_secret_key = WeiXinUniqueToken.generate(generator: :urlsafe_base64, size: 24) if weixin_secret_key.blank?
-            self.weixin_token = WeiXinUniqueToken.generate if weixin_token.blank?
-          end
-        end
-      end
-
   end
 end

data/lib/weixin_rails_middleware/helpers/auto_generate_weixin_token_secret_key.rb

@@ -0,0 +1,20 @@
+module WeixinRailsMiddleware
+  module AutoGenerateWeixinTokenSecretKey
+    extend ActiveSupport::Concern
+
+    included do
+
+      before_create do
+        # TODO: refactor
+        self.weixin_secret_key =  generate_weixin_secret_key
+        self.weixin_token      = WeiXinUniqueToken.generate
+      end
+    end
+
+    private
+
+    def generate_weixin_secret_key
+      WeiXinUniqueToken.generate(generator: :urlsafe_base64, size: 24)
+    end
+  end
+end

data/lib/weixin_rails_middleware/version.rb

@@ -1,3 +1,3 @@
 module WeixinRailsMiddleware
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weixin_rails_middleware
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - lanrion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -114,6 +114,7 @@ files:
 - lib/weixin_rails_middleware.rb
 - lib/weixin_rails_middleware/configuration.rb
 - lib/weixin_rails_middleware/engine.rb
+- lib/weixin_rails_middleware/helpers/auto_generate_weixin_token_secret_key.rb
 - lib/weixin_rails_middleware/helpers/reply_weixin_message_helper.rb
 - lib/weixin_rails_middleware/helpers/unique_token_helper.rb
 - lib/weixin_rails_middleware/helpers/weixin_authorize_helper.rb