funky_form 0.1.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 056514e20bfae06f635ac1cbc1cbb62bc801b2acd1beb4b238c5ecfd0412a0f2
+  data.tar.gz: 1a65919513cd99a768e64792b51de4d4d670bb8615b56e2a9fb9ccd7ee18a515
+SHA512:
+  metadata.gz: 592eb8128ca9d493046ef5904a3ff7b5208230747ddfae5d9f5ae8c6e8a85d663f15ad8f16e5e73fd33127a14554e0d63df8788fc959f6a43e5058b79d2b487c
+  data.tar.gz: 67f1d8d1221b4a8869f1766c56ad6e1bcfc63a4d011de4b830afa833492518c00367618e0a86fb029652b31321845539387370a834bf485d5a88dcf8cbb4d566

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+before_script: cd test/dummy && rake db:migrate && cd ../..

data/Gemfile

@@ -4,7 +4,10 @@ gem "rails", "~> 3.2.0"
 gem "sqlite3"
 gem "capybara"
 gem "launchy"
-gem "minitest"
+
+gem "minitest", "~> 5.0"
+#gem "minitest-rails"
+gem "minitest-capybara"
 
 # Specify your gem's dependencies in funky_form.gemspec
 gemspec

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2013-2020 Indrek Juhkam
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the “Software”), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/funky_form.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = ""
   s.summary     = %q{Simple form objects in ruby}
   s.description = %q{}
+  s.license     = "MIT"
 
   s.rubyforge_project = "funky_form"
 
@@ -18,6 +19,6 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "virtus", "~> 0.5.4"
-  s.add_dependency "activemodel", "~> 3.2.0"
+  s.add_dependency "virtus", "~> 1.0"
+  s.add_dependency "activemodel", ">= 3.2.0"
 end

data/lib/funky_form.rb

@@ -7,7 +7,7 @@ module FunkyForm
   # @param [Class] descendant
   def self.included(descendant)
     super
-    descendant.send(:include, Virtus)
+    descendant.send(:include, Virtus.model)
     descendant.send(:include, ActiveModel::Validations)
     descendant.send(:include, ActiveModel::Conversion)
     descendant.send(:include, InstanceMethods)

data/lib/funky_form/class_methods.rb

@@ -4,7 +4,7 @@ module FunkyForm
       if model_name
         @model_name = model_name
       else
-        @model_name ||= super()
+        @model_name ||= superclass.model_name
       end
     end
 

data/lib/funky_form/version.rb

@@ -1,3 +1,3 @@
 module FunkyForm
-  VERSION = "0.1.0"
+  VERSION = "0.2.1"
 end

data/test/{integration → acceptance}/posts_test.rb

@@ -1,6 +1,6 @@
-require_relative "../integration_test_helper"
+require "acceptance_test_helper"
 
-class PostsTest < ActiveSupport::IntegrationCase
+class PostsTest < AcceptanceTest
   def test_creating_a_post
     visit new_post_path
 

data/test/{integration_test_helper.rb → acceptance_test_helper.rb}

@@ -1,11 +1,9 @@
-require_relative "test_helper"
+require "test_helper"
+require "minitest-capybara"
 
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
-
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
-require "rails/test_help"
-
 Rails.backtrace_cleaner.remove_silencers!
 
 # Configure capybara for integration testing
@@ -13,7 +11,7 @@ require "capybara/rails"
 Capybara.default_driver   = :rack_test
 Capybara.default_selector = :css
 
-class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
+class AcceptanceTest < MiniTest::Test
   include Capybara::DSL
   include Rails.application.routes.url_helpers
 end

data/test/funky_form_test.rb

@@ -1,6 +1,6 @@
 require_relative "test_helper"
 
-class FunkyFormTest < MiniTest::Unit::TestCase
+class FunkyFormTest < MiniTest::Test
   parallelize_me!
 
   def test_values_from_existing_instance
@@ -81,6 +81,29 @@ class FunkyFormTest < MiniTest::Unit::TestCase
     assert_equal "Order", form_class.model_name.to_s
   end
 
+  def test_model_inheritance
+    base_class = new_funky_form do
+      model "Order"
+    end
+
+    form_class = Class.new(base_class)
+
+    assert_equal "Order", form_class.model_name.to_s
+  end
+
+  def test_model_inheritance_with_different_model_name
+    base_class = new_funky_form do
+      model "Order"
+    end
+
+    form_class = Class.new(base_class) do
+      model "ConcreteOrder"
+    end
+
+    assert_equal "Order", base_class.model_name.to_s
+    assert_equal "ConcreteOrder", form_class.model_name.to_s
+  end
+
   def test_validations
     form = new_funky_form do
       attribute :title, String
@@ -92,4 +115,19 @@ class FunkyFormTest < MiniTest::Unit::TestCase
     assert !form.new(:title => "").valid?, "should be invalid when empty"
     assert !form.new.valid?, "should be invalid when not specified"
   end
+
+  def test_validations_with_model_inheritance
+    base_class = new_funky_form do
+    end
+
+    form = Class.new(base_class) do
+      model "Order"
+
+      attribute :title, String
+      validates :title, :presence => true
+    end
+
+    assert form.new(:title => "a title").valid?
+    assert !form.new(:title => nil).valid?, "should be invalid when nil"
+  end
 end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 require "minitest/autorun"
 require_relative "../lib/funky_form"
 
-class MiniTest::Unit::TestCase
+class MiniTest::Test
   private
 
   def new_funky_form(&block)

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: funky_form
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Indrek Juhkam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-13 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
-    none: false
+        version: '1.0'
   type: :runtime
-  name: virtus
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.4
-    none: false
-  prerelease: false
+        version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    none: false
   type: :runtime
-  name: activemodel
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-    none: false
-  prerelease: false
 description: ''
 email:
 - indrek@urgas.eu
@@ -50,8 +45,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
+- LICENSE
 - README.rdoc
 - Rakefile
 - funky_form.gemspec
@@ -59,6 +56,8 @@ files:
 - lib/funky_form/class_methods.rb
 - lib/funky_form/instance_methods.rb
 - lib/funky_form/version.rb
+- test/acceptance/posts_test.rb
+- test/acceptance_test_helper.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/posts_controller.rb
@@ -86,7 +85,6 @@ files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20120306162814_create_posts.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
@@ -96,37 +94,28 @@ files:
 - test/dummy/public/stylesheets/.gitkeep
 - test/dummy/script/rails
 - test/funky_form_test.rb
-- test/integration/posts_test.rb
-- test/integration_test_helper.rb
 - test/test_helper.rb
 homepage: ''
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      hash: -865947392686571946
       version: '0'
-      segments:
-      - 0
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      hash: -865947392686571946
       version: '0'
-      segments:
-      - 0
-  none: false
 requirements: []
-rubyforge_project: funky_form
-rubygems_version: 1.8.24
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple form objects in ruby
 test_files: []