sumaki 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743c9cc65c7fb7b06a254d6f96ccacd405101fbd87b12b9ba9a0283341f0203b
-  data.tar.gz: 922c9652b6a0bee5fcca21e261b653a8fe9362ad0ee174050f6a0e8fae9986d1
+  metadata.gz: 4b7187ea951d6b5b682b054303d696ce2c65e205519c151aed52a7e6a542cdf7
+  data.tar.gz: 70631c497947954364961b3fde444bcc56be61b534687826872cab5efa139e86
 SHA512:
-  metadata.gz: 3d368a98fe977ba95aad3b0d01233a46eb00391e0c2825faa6b4fe9991b6394808a90dbfe37af1648ddf3bed13b904fb3dee72f5ee83237c4c0d876a628df660
-  data.tar.gz: 122196f48283f4e23f3a9ba52d84aff764487066016da59bb42e5fe5e405780bde902f41bf45bc25ead3b6fcc5347935b786d4723e17328f137052b0ff0836ed
+  metadata.gz: a913803fdde6db3a69bce4ad967048673c6d3b089d05265029d21e09074b817d45cb7b3c2f1570cc50e3ec034bdb85420eb7f38a0b6625803d2054bbb4fad733
+  data.tar.gz: 355746b7f56600a79023a056aaaee86a599f9b5951b371b8b6a600086428cf392528f8447bc03f71f3173a91cd939b661d1134cb80cae4d99c993053e9973987

data/Gemfile.lock

@@ -2,69 +2,88 @@ PATH
   remote: .
   specs:
     sumaki (0.1.0)
+      minenum
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    debug (1.7.1)
-      irb (>= 1.5.0)
-      reline (>= 0.3.1)
-    diff-lcs (1.5.0)
+    debug (1.9.2)
+      irb (~> 1.10)
+      reline (>= 0.3.8)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    io-console (0.6.0)
-    irb (1.6.2)
-      reline (>= 0.3.0)
-    json (2.6.3)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    io-console (0.7.2)
+    irb (1.12.0)
+      rdoc
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    minenum (0.1.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
+      racc
+    psych (5.1.2)
+      stringio
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.2)
-    reline (0.3.2)
+    rake (13.2.1)
+    rdoc (6.6.3.1)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.0)
+    reline (0.5.2)
       io-console (~> 0.5)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rexml (3.2.6)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.44.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.63.3)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-capybara (2.17.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
-    rubocop-rspec (2.18.1)
-      rubocop (~> 1.33)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.29.1)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
+      rubocop-factory_bot (~> 2.22)
+      rubocop-rspec_rails (~> 2.28)
+    rubocop-rspec_rails (2.28.3)
+      rubocop (~> 1.40)
+    ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    unicode-display_width (2.4.2)
+    stringio (3.1.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -77,4 +96,4 @@ DEPENDENCIES
   sumaki!
 
 BUNDLED WITH
-   2.4.5
+   2.5.9

data/README.md

@@ -2,6 +2,8 @@
 
 ---
 
+[![Gem Version](https://badge.fury.io/rb/sumaki.svg)](https://badge.fury.io/rb/sumaki)
+![example workflow](https://github.com/nowlinuxing/sumaki/actions/workflows/main.yml/badge.svg?branch=main)
 [![Maintainability](https://api.codeclimate.com/v1/badges/dd92d4092d6858cbcfb2/maintainability)](https://codeclimate.com/github/nowlinuxing/sumaki/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/dd92d4092d6858cbcfb2/test_coverage)](https://codeclimate.com/github/nowlinuxing/sumaki/test_coverage)
 
@@ -223,7 +225,7 @@ By declaring `enum`, You can map a field to the specified value.
 class Character
   include Sumaki::Model
   field :name
-  enum :type, vampire: 1, vampire_hunter: 2, familier: 3, editor: 4
+  enum :type, { vampire: 1, vampire_hunter: 2, familier: 3, editor: 4 }
 end
 
 data = {
@@ -244,7 +246,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/sumaki.
+Bug reports and pull requests are welcome on GitHub at https://github.com/nowlinuxing/sumaki.
 
 ## License
 

data/lib/sumaki/model/association.rb

@@ -107,8 +107,6 @@ module Sumaki
       end
 
       module InstanceMethods # :nodoc:
-        private
-
         def get(name)
           self.class.adapter.get(object, name)
         end

data/lib/sumaki/model/enum.rb

@@ -1,33 +1,21 @@
 # frozen_string_literal: true
 
+require 'minenum'
+
 module Sumaki
   module Model
     # = Sumaki::Model::Enum
     module Enum
       def self.included(base)
+        base.include Minenum::Model
         base.extend ClassMethods
       end
 
-      class EnumValue < Hash # :nodoc:
-        code = <<-RUBY
-          case value
-          when Symbol then super(value) || super(value.to_s)
-          when String then super(value) || super(value.to_sym)
-          else super(value)
-          end
-        RUBY
-
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
-          def key?(value); #{code}; end
-        RUBY
-
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
-          def key(value); #{code}; end
-        RUBY
-
-        class_eval <<-RUBY, __FILE__, __LINE__ + 1 # rubocop:disable Style/DocumentDynamicEvalDefinition
-          def value?(value); #{code}; end
-        RUBY
+      module EnumAttrAccessor # :nodoc:
+        def get(model, name)
+          model.get(name)
+        end
+        module_function :get
       end
 
       module ClassMethods # :nodoc:
@@ -36,7 +24,7 @@ module Sumaki
         #   class Character
         #     include Sumaki::Model
         #     field :name
-        #     enum :type, vampire: 1, vampire_hunter: 2, familier: 3, editor: 4
+        #     enum :type, { vampire: 1, vampire_hunter: 2, familier: 3, editor: 4 }
         #   end
         #
         #   data = {
@@ -45,19 +33,11 @@ module Sumaki
         #   }
         #
         #   character = Character.new(data)
-        #   character.type #=> :familier
-        def enum(name, **values)
-          values = EnumValue[values]
-
-          enum_methods_module.define_method(name) do
-            value = get(name)
-
-            if values.key?(value)
-              value
-            elsif values.value?(value)
-              values.key(value)
-            end
-          end
+        #   character.type.name #=> :familier
+        #   character.type.familier? #=> true
+        #   character.type.vampire? #=> false
+        def enum(name, values)
+          super(name, values, adapter: EnumAttrAccessor)
         end
 
         private
@@ -69,6 +49,11 @@ module Sumaki
             mod
           end
         end
+
+        # TODO: remove this
+        def classify(key)
+          key.gsub(/([a-z\d]+)_?/) { |_| Regexp.last_match(1).capitalize }
+        end
       end
     end
   end

data/lib/sumaki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sumaki
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: sumaki
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Loose Coupling
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-19 00:00:00.000000000 Z
-dependencies: []
+date: 2024-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minenum
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Sumaki is a wrapper for structured data like JSON.
   Since Sumaki wraps the target data as it is, rather than parsing it using a schema, the original data can be referenced at any time.
@@ -39,7 +53,6 @@ files:
 - lib/sumaki/model/enum.rb
 - lib/sumaki/version.rb
 - sig/sumaki.rbs
-- sumaki.gemspec
 homepage: https://github.com/nowlinuxing/sumaki/
 licenses:
 - MIT
@@ -57,14 +70,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Sumaki is a wrapper for structured data like JSON.

data/sumaki.gemspec

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'lib/sumaki/version'
-
-Gem::Specification.new do |spec|
-  spec.name = 'sumaki'
-  spec.version = Sumaki::VERSION
-  spec.authors = ['Loose Coupling']
-  spec.email = ['loosecpl@gmail.com']
-
-  spec.summary = 'Sumaki is a wrapper for structured data like JSON.'
-  spec.description = <<~DESC
-    Sumaki is a wrapper for structured data like JSON.
-    Since Sumaki wraps the target data as it is, rather than parsing it using a schema, the original data can be referenced at any time.
-    This makes it easy to add or modify definitions as needed while checking the target data.
-    This feature may be useful when there is no document defining the structure of the data, or when the specification is complex and difficult to grasp, and the definition is written little by little starting from the obvious places.
-  DESC
-  spec.homepage = 'https://github.com/nowlinuxing/sumaki/'
-  spec.license = 'MIT'
-  spec.required_ruby_version = '>= 2.6.0'
-
-  spec.metadata['allowed_push_host'] = 'https://rubygems.org/'
-
-  spec.metadata['homepage_uri'] = spec.homepage
-  spec.metadata['source_code_uri'] = spec.homepage
-  spec.metadata['changelog_uri'] = spec.homepage
-  spec.metadata['rubygems_mfa_required'] = 'true'
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = 'exe'
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end