ruboty-variable 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb8e5f840f7ccaebfce105e659c9ea6beda3971c
-  data.tar.gz: 65edd0653a07a661bdeb26bac79910e9248b6edf
+  metadata.gz: d609c506eaa0a6f86ad30db21ced82e2389710e5
+  data.tar.gz: 1f96504e71d3bb97dc5767f78519a434d9ccc341
 SHA512:
-  metadata.gz: f23b3bee227208142e4d9b3086effadc1fbbaf7a30f061b2d80fa748b99ff28cf83c1df3e55505cff44abcaeefbed044c77cc4d690c9eafe2cafca2634276ff5
-  data.tar.gz: bf4d81183ba16c8c706bd14fbf4ed3a3ea770694b861487e8963e04f190475c99de806a3c01e50ecc2f741c5c952da4e85f11dc724daa8e348e9fcb27aa0cf66
+  metadata.gz: 27a0a6d3dc19e263d39c22607eb58668579058750d2387987e15b67532bb2c54ff8c017feb3a61391d555ceb82eb0f6000aaab4cb18990ff9e36bd98bffa38dd
+  data.tar.gz: 71beb09f1e8c92a14dc4ddd0e379ec37f5a9aa009e1be71c5483f350bf3043624d7646036576025ddd17d52dba7ea00b58699ddcb5a8675699a3d68780905144

data/lib/ruboty/handlers/variable.rb

@@ -1,4 +1,11 @@
 require "ruboty/variable/actions/variable"
+require "ruboty/variable/actions/set"
+require "ruboty/variable/actions/get"
+require "ruboty/variable/actions/delete"
+require "ruboty/variable/actions/list"
+require "ruboty/variable/actions/array_init"
+require "ruboty/variable/actions/array_push"
+require "ruboty/variable/actions/array_remove"
 
 module Ruboty
   module Handlers
@@ -12,84 +19,31 @@ module Ruboty
       on /var array remove (?<key>\S+?) (?<values>.+?)\z/, name: 'array_remove', description: 'Remove values from array'
 
       def get_value(message)
-        Ruboty::Variable::Actions::Variable.new(message).get(message[:key])
+        Ruboty::Variable::Actions::Get.new(message).call(message[:key])
       end
 
       def set_value(message)
-        Ruboty::Variable::Actions::Variable.new(message).set(message[:key], message[:value])
+        Ruboty::Variable::Actions::Set.new(message).call(message[:key], message[:value])
       end
 
       def delete_value(message)
-        Ruboty::Variable::Actions::Variable.new(message).delete(message[:key])
+        Ruboty::Variable::Actions::Delete.new(message).call(message[:key])
       end
 
       def list_values(message)
-        Ruboty::Variable::Actions::Variable.new(message).list()
+        Ruboty::Variable::Actions::List.new(message).call
       end
 
       def array_init(message)
-        Ruboty::Variable::Actions::Variable.new(message).array_init(message[:key])
+        Ruboty::Variable::Actions::ArrayInit.new(message).call(message[:key])
       end
 
       def array_push(message)
-        Ruboty::Variable::Actions::Variable.new(message).array_push(message[:key], message[:values])
+        Ruboty::Variable::Actions::ArrayPush.new(message).call(message[:key], message[:values])
       end
 
       def array_remove(message)
-        Ruboty::Variable::Actions::Variable.new(message).array_push(message[:key], message[:values])
-      end
-
-      on /var test\z/, name: 'test_values', hide: true
-
-      def test_values(message)
-        var = Ruboty::Variable::Actions::Variable.new(message)
-        puts '# set'
-        var.set("hoge", "hoge_value")
-        var.set("123457", "999")
-        var.set("aohef23", "awef8a23a3a32")
-        var.set("string", "string_value")
-
-        puts "\n# get"
-        var.get("hoge")
-        var.get("piyo")
-
-        puts "\n# list"
-        var.list
-
-        puts "\n# delete"
-        var.delete("hoge")
-        var.delete("hoge")
-        var.list
-
-        puts "\n# init array"
-        var.array_init("ary")
-        var.array_init("string")
-        var.array_init("string")
-        var.list
-
-        puts "\n# push array"
-        var.array_push("ary", "one")
-        var.array_push("ary", "two")
-        var.array_push("ary", "two")
-        var.list
-
-        puts "\n# push array to empty array"
-        var.array_push("hoge", "kkkk")
-        var.array_push("zxcv", "pppp")
-
-        puts "\n# push values to array"
-        var.array_push("ary", "three four five")
-        var.list
-
-        puts "\n# remove values from array"
-        var.array_remove("ary", "one three")
-        var.list
-
-        puts "\n# remove error"
-        var.array_remove("ary", "one three")
-        var.array_remove("noary", "one")
-        var.array_remove("123457", "one")
-        var.list
+        Ruboty::Variable::Actions::ArrayRemove.new(message).call(message[:key], message[:values])
       end
     end
   end

data/lib/ruboty/variable.rb

@@ -11,40 +11,40 @@ module Ruboty
       end
 
       def set(key, value)
-        values[key] = {
+        data[key] = {
             :type => 'string',
             :value => value
         }
       end
 
       def get(key)
-        values[key][:value] if values.has_key?(key)
+        data[key][:value] if data.has_key?(key)
       end
 
       def type(key)
-        values[key][:type] if values.has_key?(key)
+        data[key][:type] if data.has_key?(key)
       end
 
       def array_init(key)
-        values[key] = {
+        data[key] = {
             :type => 'array',
             :value => []
         }
       end
 
       def array_push(key, value)
-        values[key][:value] << value unless array_include?(key, value)
+        data[key][:value] << value unless array_include?(key, value)
       end
 
       def array_remove(key, value)
-        values[key][:value].delete(value) if array_include?(key, value)
+        data[key][:value].delete(value) if array_include?(key, value)
       end
 
       def array_include?(key, value)
-        values[key][:value].include?(value) if type(key) == 'array'
+        data[key][:value].include?(value) if type(key) == 'array'
       end
 
-      def values
+      def data
         @values
       end
     end

data/lib/ruboty/variable/actions/array_init.rb

@@ -0,0 +1,28 @@
+module Ruboty
+  module Variable
+    module Actions
+      class ArrayInit < Ruboty::Variable::Actions::Variable
+        def call(key)
+          was_type = var.type(key)
+
+          var.array_init(key)
+
+          if was_type == 'array'
+            message.reply(clear_message(key))
+          else
+            message.reply(create_message(key))
+          end
+        end
+
+        def create_message(key)
+          "Created #{key} empty array"
+        end
+
+        def clear_message(key)
+          "Clear #{key} array"
+        end
+      end
+    end
+  end
+end
+

data/lib/ruboty/variable/actions/array_push.rb

@@ -0,0 +1,44 @@
+module Ruboty
+  module Variable
+    module Actions
+      class ArrayPush < Ruboty::Variable::Actions::Variable
+        def call(key, values)
+          case var.type(key)
+            when 'array'
+              values.split(/\s+/).each {|value| push(key, value)}
+            when nil
+              message.reply(undefined_message(key))
+            else
+              message.reply(type_error_message(key))
+          end
+        end
+
+        def push(key, value)
+          if var.array_include?(key, value)
+            message.reply(included_message(key, value))
+          else
+            var.array_push(key, value)
+            message.reply(push_message(key, value))
+          end
+        end
+
+        def included_message(key, value)
+          "#{key} already included #{value}"
+        end
+
+        def push_message(key, value)
+          "Push #{value} to #{key}"
+        end
+
+        def type_error_message(key)
+          "#{key} is not array type"
+        end
+
+        def undefined_message(key)
+          "Undefined #{key}"
+        end
+      end
+    end
+  end
+end
+

data/lib/ruboty/variable/actions/array_remove.rb

@@ -0,0 +1,44 @@
+module Ruboty
+  module Variable
+    module Actions
+      class ArrayRemove < Ruboty::Variable::Actions::Variable
+        def call(key, values)
+          case var.type(key)
+            when 'array'
+              values.split(/\s+/).each {|value| remove(key, value)}
+            when nil
+              message.reply(undefined_message(key))
+            else
+              message.reply(type_error_message(key))
+          end
+        end
+
+        def remove(key, value)
+          if var.array_include?(key, value)
+            var.array_remove(key, value)
+            message.reply(remove_message(key, value))
+          else
+            message.reply(not_found_message(key, value))
+          end
+        end
+
+        def remove_message(key, value)
+          "Remove #{value} from #{key}"
+        end
+
+        def not_found_message(key, value)
+          "#{value} is not found in #{key}"
+        end
+
+        def type_error_message(key)
+          "#{key} is not array type"
+        end
+
+        def undefined_message(key)
+          "Undefined #{key}"
+        end
+      end
+    end
+  end
+end
+

data/lib/ruboty/variable/actions/delete.rb

@@ -0,0 +1,25 @@
+module Ruboty
+  module Variable
+    module Actions
+      class Delete < Ruboty::Variable::Actions::Variable
+        def call(key)
+          if var.data.has_key?(key)
+            var.data.delete(key)
+            message.reply(delete_message(key))
+          else
+            message.reply(undefined_message(key))
+          end
+        end
+
+        def delete_message(key)
+          "Deleted #{key}"
+        end
+
+        def undefined_message(key)
+          "Undefined #{key}"
+        end
+      end
+    end
+  end
+end
+

data/lib/ruboty/variable/actions/get.rb

@@ -0,0 +1,20 @@
+module Ruboty
+  module Variable
+    module Actions
+      class Get < Ruboty::Variable::Actions::Variable
+        def call(key)
+          if var.data.has_key?(key)
+            message.reply(var.get(key))
+          else
+            message.reply(undefined_message(key))
+          end
+        end
+
+        def undefined_message(key)
+          "Undefined #{key}"
+        end
+      end
+    end
+  end
+end
+

data/lib/ruboty/variable/actions/list.rb

@@ -0,0 +1,40 @@
+module Ruboty
+  module Variable
+    module Actions
+      class List < Ruboty::Variable::Actions::Variable
+        def call
+          if var.data.empty?
+            message.reply(empty_message)
+          else
+            message.reply(variable_descriptions, code: true)
+          end
+        end
+
+        def empty_message
+          'Variable is empty'
+        end
+
+        def variable_descriptions
+          key_len = [max_key_length, 'key'.size].max
+          type_len = [max_type_length, 'type'.size].max
+
+          header = "%-#{key_len}s   %-#{type_len}s   value\n" % %w(key type)
+
+          body = var.data.map do |k, v|
+            "%-#{key_len}s - %-#{type_len}s - #{v[:value]}" % [k, v[:type]]
+          end.join("\n")
+
+          header << body
+        end
+
+        def max_key_length
+          var.data.keys.map(&:size).max
+        end
+
+        def max_type_length
+          var.data.values.map {|x| x[:type].size}.max
+        end
+      end
+    end
+  end
+end

data/lib/ruboty/variable/actions/set.rb

@@ -0,0 +1,30 @@
+module Ruboty
+  module Variable
+    module Actions
+      class Set < Ruboty::Variable::Actions::Variable
+        def call(key, value)
+          had_key = var.data.has_key?(key)
+
+          var.set(key, value)
+
+          message.reply(
+            if had_key
+              overwrite_message(key, value)
+            else
+              set_message(key, value)
+            end
+          )
+        end
+
+        def set_message(key, value)
+          "Set #{value} to #{key}"
+        end
+
+        def overwrite_message(key, value)
+          "Overwrite #{value} to #{key}"
+        end
+      end
+    end
+  end
+end
+

data/lib/ruboty/variable/actions/variable.rb

@@ -7,102 +7,8 @@ module Ruboty
           @var = Ruboty::Variable::Variable.new(message)
         end
 
-        def set(key, value)
-          if @var.values.has_key?(key)
-            message.reply("Overwrite #{value} to #{key}")
-          else
-            message.reply("Set #{value} to #{key}")
-          end
-
-          @var.set(key, value)
-        end
-
-        def get(key)
-          if @var.values.has_key?(key)
-            message.reply(@var.get(key))
-          else
-            message.reply("Undefined #{key}")
-          end
-        end
-
-        def delete(key)
-          if @var.values.has_key?(key)
-            @var.values.delete(key)
-            message.reply("Deleted #{key}")
-          else
-            message.reply("Undefined #{key}")
-          end
-        end
-
-        def list
-          if @var.values.empty?
-            message.reply('Variable is empty')
-          else
-            message.reply(variable_descriptions, code: true)
-          end
-        end
-
-        def array_init(key)
-          if @var.type(key) == 'array'
-            message.reply("Clear #{key} array")
-          else
-            message.reply("Created #{key} empty array")
-          end
-          @var.array_init(key)
-        end
-
-        def array_push(key, values)
-          case @var.type(key)
-            when 'array'
-              values.split(/\s+/).each do |value|
-                if @var.array_include?(key, value)
-                  message.reply("#{key} already included #{value}")
-                else
-                  @var.array_push(key, value)
-                  message.reply("Push #{value} to #{key}")
-                end
-              end
-            when nil
-              message.reply("Undefined #{key}")
-            else
-              message.reply("#{key} is not array type")
-          end
-        end
-
-        def array_remove(key, values)
-          case @var.type(key)
-            when 'array'
-              values.split(/\s+/).each do |value|
-                if @var.array_include?(key, value)
-                  @var.array_remove(key, value)
-                  message.reply("Remove #{value} from #{key}")
-                else
-                  message.reply("#{value} is not found in #{key}")
-                end
-              end
-            when nil
-              message.reply("Undefined #{key}")
-            else
-              message.reply("#{key} is not array type")
-          end
-        end
-
-        def variable_descriptions
-          key_len = [max_key_length, 'key'.size].max
-          type_len = [max_type_length, 'type'.size].max
-
-          mes = "%-#{key_len}s   %-#{type_len}s   value\n" % %w(key type)
-          mes << @var.values.map do |k, v|
-            "%-#{key_len}s - %-#{type_len}s - #{v[:value]}" % [k, v[:type]]
-          end.join("\n")
-        end
-
-        def max_key_length
-          @var.values.keys.map(&:size).max
-        end
-
-        def max_type_length
-          @var.values.values.map {|x| x[:type].size}.max
+        protected def var
+            @var
         end
       end
     end

data/lib/ruboty/variable/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module Variable
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-variable
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - snakazawa
@@ -66,6 +66,13 @@ files:
 - Rakefile
 - lib/ruboty/handlers/variable.rb
 - lib/ruboty/variable.rb
+- lib/ruboty/variable/actions/array_init.rb
+- lib/ruboty/variable/actions/array_push.rb
+- lib/ruboty/variable/actions/array_remove.rb
+- lib/ruboty/variable/actions/delete.rb
+- lib/ruboty/variable/actions/get.rb
+- lib/ruboty/variable/actions/list.rb
+- lib/ruboty/variable/actions/set.rb
 - lib/ruboty/variable/actions/variable.rb
 - lib/ruboty/variable/version.rb
 - ruboty-variable.gemspec