magellan-rails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bab654b4f481e42231eabc304585074524037978
-  data.tar.gz: 513e1bfc85306e65ed3d560f045b31dedf5c45c2
+  metadata.gz: aff59ea017fc9a24aed8995129eda046534287d6
+  data.tar.gz: 2f581b6c7f596a8ed0a62127258e84891f849c5f
 SHA512:
-  metadata.gz: 374417907f0e88bf1286d112a2a4b038e9722dfef5300a039730f07e67baccf05af7c041120d6b68b161613a9fc866244430e832ccbae8df4e64194c4fd3db5e
-  data.tar.gz: 71a41a879cabbe907014f13625839dccaf696d2b84e0347f2f69c8158d21b921d51959731901253234a7aa6751d03fe2a750bbd52b165ed0ebd0e41fafa4bd48
+  metadata.gz: e837a14ddebe97bc16d438dd825ca1a07619d676fa91a95f119002f35176d6e0ceab67301fd7ea492d4beca5b46c52fd5918039bc05ce65d232df5fb8ecf4652
+  data.tar.gz: 49323c5a936fbbced6916b148cf958d109935e5fd10933369ae4dd48286b8ae87e9708f848ee81eb4923652a29f72d942939b81c82308c700c1f89d403c97f11

data/lib/magellan/rails/version.rb

@@ -1,5 +1,5 @@
 module Magellan
   module Rails
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/magellan/subscriber/mapper.rb

@@ -1,11 +1,20 @@
 # -*- coding: utf-8 -*-
 require 'magellan/rails'
+require "yaml"
 
 class Magellan::Subscriber::RoutingError < StandardError
 end
 
 class Magellan::Subscriber::Mapper
-  def initialize(map_file_path=Rails.root.join("config/subscribes.yml"))
+  def self.default_mapper_file
+    map_file_path = ::Rails.root.join("config/subscriptions.yml")
+    unless map_file_path.readable?
+      map_file_path = ::Rails.root.join("config/subscribes.yml")
+    end
+    map_file_path.to_path
+  end
+
+  def initialize(map_file_path=self.class.default_mapper_file)
     # テストのため nil で初期化できるようにしています
     if map_file_path
       @config_file = map_file_path.to_s

data/spec/magellan/subscriber/mapper_spec.rb

@@ -4,6 +4,7 @@ require "spec_helper"
 
 require "magellan/subscriber"
 require "magellan/subscriber/mapper"
+require "rails"
 
 describe Magellan::Subscriber::Mapper do
 
@@ -259,6 +260,50 @@ describe Magellan::Subscriber::Mapper do
         end
       end
     end
+  end
 
+  describe "#initialize" do
+    before do
+      @tmpdir = Dir.mktmpdir
+      @subscribes_file = File.join(@tmpdir, "subscribes.yml")
+      @subscriptions_file = File.join(@tmpdir, "subscriptions.yml")
+      @root = double "Rails.root"
+      allow(::Rails).to receive(:root).and_return(@root)
+      allow(@root).to receive(:join).with("config/subscribes.yml").and_return(Pathname(@subscribes_file))
+      allow(@root).to receive(:join).with("config/subscriptions.yml").and_return(Pathname(@subscriptions_file))
+      @prepare_subscribes_file = ->() { open(@subscribes_file, "w") { |f| f.puts "t: verbs#action" } }
+      @prepare_subscriptions_file = ->() { open(@subscriptions_file, "w") { |f| f.puts "t: nouns#action" } }
+    end
+    after do
+      FileUtils.rm_rf(@tmpdir)
+    end
+    context "subscribes.yml exists" do
+      before do
+        @prepare_subscribes_file.call
+      end
+      it "use subscribes.yml" do
+        mapper = Magellan::Subscriber::Mapper.new
+        expect(mapper.map_action("t")).to eql([["VerbsSubscriber", "action"]])
+      end
+    end
+    context "subscriptions.yml exists" do
+      before do
+        @prepare_subscriptions_file.call
+      end
+      it "use subscriptions.yml" do
+        mapper = Magellan::Subscriber::Mapper.new
+        expect(mapper.map_action("t")).to eql([["NounsSubscriber", "action"]])
+      end
+    end
+    context "both subscribes.yml and subscriptions.yml exists" do
+      before do
+        @prepare_subscribes_file.call
+        @prepare_subscriptions_file.call
+      end
+      it "use subscriptions.yml" do
+        mapper = Magellan::Subscriber::Mapper.new
+        expect(mapper.map_action("t")).to eql([["NounsSubscriber", "action"]])
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magellan-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Yuuki Noguchi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties