iqvoc_compound_forms 1.1.2 → 2.0.0

data/.travis.yml

@@ -0,0 +1,19 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+
+env:
+  - DB=sqlite
+  - DB=mysql
+
+before_script: ruby ./script/ci/travis_before_build.rb
+script: bundle exec rake iqvoc:setup:generate_secret_token db:drop db:create iqvoc:db:migrate_all test RAILS_ENV=test
+
+branches:
+  only:
+    - master
+
+notifications:
+  recipients:
+    - iqvoc@innoq.com

data/Gemfile

@@ -1,11 +1,18 @@
 source "http://rubygems.org"
 
-gem 'rails',        '~> 3.2.1'
-gem 'iqvoc',        '~> 3.5.1'#, :path => '../iqvoc'
-gem 'iqvoc_skosxl', '~> 1.2.0'#, :path => '../iqvoc_skosxl'
+gem 'rails',        '~> 3.2.2'
+gem 'iqvoc',        '~> 4.0.0'
+gem 'iqvoc_skosxl', '~> 2.0.0'
 
 group :development, :test do
-  gem 'sqlite3'
+  platforms :ruby do
+    gem 'mysql2'
+    gem 'sqlite3'
+  end
+  platforms :jruby do
+    gem 'activerecord-jdbcsqlite3-adapter'
+    gem 'activerecord-jdbcmysql-adapter'
+  end
 end
 
 group :test do

data/Gemfile.lock

@@ -35,13 +35,13 @@ GEM
     builder (3.0.0)
     cancan (1.6.7)
     erubis (2.7.0)
-    fastercsv (1.5.4)
+    fastercsv (1.5.5)
     hike (1.2.1)
     i18n (0.6.0)
     iq_rdf (0.1.5)
       builder
       bundler
-    iqvoc (3.5.6)
+    iqvoc (4.0.0)
       authlogic
       bundler
       cancan
@@ -51,21 +51,24 @@ GEM
       kaminari
       rails (~> 3.2.1)
       rails_autolink
-    iqvoc_skosxl (1.2.3)
+      sass-rails (~> 3.2.5)
+      simple_form
+    iqvoc_skosxl (2.0.0)
       bundler
-      iqvoc (~> 3.5.1)
+      iqvoc (~> 4.0.0)
     journey (1.0.3)
     json (1.6.5)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    mail (2.4.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     multi_json (1.1.0)
+    mysql2 (0.3.11)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -82,7 +85,7 @@ GEM
       activesupport (= 3.2.2)
       bundler (~> 1.0)
       railties (= 3.2.2)
-    rails_autolink (1.0.5)
+    rails_autolink (1.0.9)
       rails (~> 3.1)
     railties (3.2.2)
       actionpack (= 3.2.2)
@@ -94,6 +97,14 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
+    sass (3.1.19)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    simple_form (2.0.2)
+      actionpack (~> 3.0)
+      activemodel (~> 3.0)
     spork (0.9.0)
     spork-testunit (0.0.8)
       spork (>= 0.6.0)
@@ -114,9 +125,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  iqvoc (~> 3.5.1)
-  iqvoc_skosxl (~> 1.2.0)
-  rails (~> 3.2.1)
+  activerecord-jdbcmysql-adapter
+  activerecord-jdbcsqlite3-adapter
+  iqvoc (~> 4.0.0)
+  iqvoc_skosxl (~> 2.0.0)
+  mysql2
+  rails (~> 3.2.2)
   spork
   spork-testunit
   sqlite3

data/app/views/partials/compound_form/_base.html.erb

@@ -1,11 +1,10 @@
-<div class="relation">
-  <h4><%= t("txt.views.labels.compound_from") %></h4>
+<div class="relation panel">
+  <h2><%= t("txt.views.labels.compound_from") %></h2>
   <div class="relation-body">
-    <%- label.send(klass.name.to_relation_name).each do |cf| -%>
+    <% label.send(klass.name.to_relation_name).each do |cf| %>
       <%= raw cf.compound_form_contents.label_published.map { |cfc|
         link_to(cfc.label.value, label_path(:id => cfc.label))
       }.join(', ') %>
-      <br />
-    <%- end -%>
+    <% end %>
   </div>
 </div>

data/app/views/partials/compound_form/_compound_form.html.erb

@@ -1,16 +1,16 @@
 <li class="compound-form">
-  <%= label_tag "inline_compound_form_origins",
-          CompoundForm::Base.model_name.human %>
-  <%- items = Iqvoc::XLLabel.base_class.editor_selectable.
+  <% items = Iqvoc::XLLabel.base_class.editor_selectable.
           by_origin(compound_form.compound_form_contents.
-              map { |cfc| cfc.label.origin }) -%>
-  <%= text_field_tag "label[inline_compound_form_origins][]",
-          items.join(Iqvoc::InlineDataHelper::Joiner),
+              map { |cfc| cfc.label.origin }) %>
+  <% fieldname = "label[inline_compound_form_origins][]" %>
+  <%= f.input fieldname, :label => t('txt.common.type_to_search') do %>
+    <%= f.text_field_tag fieldname, items.join(Iqvoc::InlineDataHelper::Joiner),
           :class => "entity_select",
           :"data-query-url" => labels_path(:format => :json),
           :"data-entity-uri" => label_path("{id}"),
           :"data-entities" => (not compound_form) ? nil : items.
               map { |l| label_widget_data(l) }.to_json %>
+  <% end %>
 
   <input type="button" class="add-compound-form" value="<%= t("txt.common.add_note") %>">
   <input type="button" class="rm-compound-form" value="<%= t("txt.common.delete") %>">

data/app/views/partials/compound_form/_edit_base.html.erb

@@ -1,4 +1,4 @@
-<%- label.compound_forms.build if label.compound_forms.empty? -%>
+<% label.compound_forms.build if label.compound_forms.empty? %>
 <% label.compound_forms.each do |compound_form| %>
     <%= render 'partials/compound_form/compound_form', :label => label, :compound_form => compound_form, :klass => klass %>
 <% end %>

data/app/views/partials/compound_form/content/_base.html.erb

@@ -1,5 +1,5 @@
-<div class="relation">
-  <h4><%= t("txt.views.labels.compound_in") %></h4>
+<div class="relation panel">
+  <h2><%= t("txt.views.labels.compound_in") %></h2>
   <div class="relation-body">
     <%= raw label.compound_in.map { |label|
             link_to(label.value, label_path(:id => label))

data/config/database.mysql.yml

@@ -0,0 +1,20 @@
+development:
+  adapter: mysql2
+  database: iqvoc_skosxl_development
+  username: root
+  password:
+  encoding: utf8
+
+test:
+  adapter: mysql2
+  database: iqvoc_skosxl_test
+  username: root
+  password:
+  encoding: utf8
+
+production:
+  adapter: mysql2
+  database: iqvoc_skosxl_production
+  username: root
+  password:
+  encoding: utf8

data/config/database.sqlite.yml

@@ -0,0 +1,17 @@
+development:
+  adapter: sqlite3
+  database: db/development.sqlite
+  timeout: 5000
+  pool: 5
+
+test:
+  adapter: sqlite3
+  database: db/test.sqlite
+  timeout: 5000
+  pool: 5
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite
+  timeout: 5000
+  pool: 5

data/iqvoc_compound_forms.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "iqvoc_compound_forms"
 
   s.add_dependency "rails", "~> 3.2.1"
-  s.add_dependency "iqvoc", "~> 3.5.1"
-  s.add_dependency "iqvoc_skosxl", "~> 1.2.0"
+  s.add_dependency "iqvoc", "~> 4.0.0"
+  s.add_dependency "iqvoc_skosxl", "~> 2.0.0"
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/iqvoc/compound_forms/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module CompoundForms
-    VERSION = "1.1.2"
+    VERSION = "2.0.0"
   end
 end

data/script/ci/travis_before_build.rb

@@ -0,0 +1 @@
+system "cp config/database.#{ENV['DB']}.yml config/database.yml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_compound_forms
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70124346592560 !ruby/object:Gem::Requirement
+  requirement: &70331186349820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,29 +23,29 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70124346592560
+  version_requirements: *70331186349820
 - !ruby/object:Gem::Dependency
   name: iqvoc
-  requirement: &70124346591560 !ruby/object:Gem::Requirement
+  requirement: &70331186349200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70124346591560
+  version_requirements: *70331186349200
 - !ruby/object:Gem::Dependency
   name: iqvoc_skosxl
-  requirement: &70124346606440 !ruby/object:Gem::Requirement
+  requirement: &70331186348140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70124346606440
+  version_requirements: *70331186348140
 description: ''
 email:
 - robert.glaser@innoq.com
@@ -54,6 +54,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -70,6 +71,8 @@ files:
 - config.ru
 - config/application.rb
 - config/boot.rb
+- config/database.mysql.yml
+- config/database.sqlite.yml
 - config/database.template.yml
 - config/engine.rb
 - config/environment.rb
@@ -94,6 +97,7 @@ files:
 - lib/iqvoc/compound_forms/version.rb
 - lib/iqvoc_compound_forms.rb
 - public/.gitkeep
+- script/ci/travis_before_build.rb
 - script/rails
 - test/test_helper.rb
 - test/unit/compound_form_test.rb
@@ -117,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iqvoc_compound_forms
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: ''