ballonizer 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 282a861cf0c674960e6940c33424e7c293b5d9dd
-  data.tar.gz: f7a18ba42d1641b5ee18edf56c957eb731a8898b
+  metadata.gz: fae524ac2bd239ca97a2332350f57961305dd1b4
+  data.tar.gz: ded555e83b156f4113bf33ced804187b2a96a83c
 SHA512:
-  metadata.gz: f9d393608f7b9e2f0804552ec647d0f51b301658932e5ae4c3cb7dc5b83ae10e917382e441922f0cab05771170746b31be5b15becc13b1390697afb68fe3c0aa
-  data.tar.gz: 3fc55d454749542a5dd6f440943e9da6307bda837ea358cea76397e57ce2efac737be6824a6d1a655dcf85c69b2cb749846192c3810ee3f7400c1fa7902c7100
+  metadata.gz: b461fd77e5331552c7cd600cb43e3db10ebadc3e961ca3691b354436311e3b6dd7a216523f9f3142da0beee9db5d86814cb1176e81230a66b30b3fbc3c861876
+  data.tar.gz: f67061e8582c4759133835109e56428f749e3252d6d85c4464489d0f30ef6deca8ff23d156513a06a2c3480c1e4455b8b093735af057e5615f257d3bf4a154eb

data/examples/ballonizer_app/config.ru

@@ -4,22 +4,16 @@ require 'sprockets'
 require 'ballonizer'
 
 path_rake_to_app = 'examples/ballonizer_app/'
+
 db_name = 'test.db'
 db_path = "#{path_rake_to_app}#{db_name}"
 db_uri = "sqlite://#{db_path}"
 
-DB = nil
-if File.exists?(db_path)
-  DB = Sequel.connect(db_uri)
-else
-  DB = Sequel.connect(db_uri)
-  Ballonizer.create_tables(DB)
-end
-
 html_name = 'index.html'
 html = File.read("#{path_rake_to_app}#{html_name}")
 
-ballonizer = Ballonizer.new(DB, {
+ballonizer = Ballonizer.new(db_uri, {
+  create_tables_if_none: true,
   form_handler_url: '/request_handler',
   add_required_css: true,
   css_asset_path_for_link: '/assets',
@@ -28,7 +22,6 @@ ballonizer = Ballonizer.new(DB, {
 })
 
 app = Rack::Builder.new do
-
   map '/' do 
     run(lambda do | env |
       # the url is needed to make relative paths to images absolute

data/lib/ballonizer.rb

@@ -145,21 +145,45 @@ class Ballonizer
     js_asset_path_for_link: nil,
     # If the ballonize_page method will add or not the html generated by
     # #js_libs_html_links (require the :js_asset_path_for_link to be defined).
-    add_required_js_libs_for_edition: false
+    add_required_js_libs_for_edition: false,
+    # If true and the database argument don't have any of the tables used by
+    # the class call create_tables over the database argument. If false or the
+    # database has at leat one of the tables does nothing.
+    create_tables_if_none: false
   }.freeze.each { | _, v| v.freeze }
 
+  USED_TABLES = [ :images, :ballons, :ballonized_image_ballons,
+                  :ballonized_image_versions].freeze
+  private_constant :USED_TABLES
+
+  # The names (as symbols) of the tables used by instances of the class.
+  # @return [Array<Symbol>] An frozen array of symbols
+  def self.used_tables
+    USED_TABLES
+  end
+
   # Create a new Ballonizer object from a Sequel Database (with the expected
   # tables, that can be created with Ballonizer.create_tables) and a optional
   # hash of settings.
-  # @param db [Sequel::Database] A Sequel::Database with tables as described
+  # @param db [String, Sequel::Database] A Sequel::Database or a String to be
+  #   used with Sequel::Database.connect. Is necessary to create the tables
+  #   with Ballonizer.create_tables unless you have set the :create_table_if_none
+  #   setting to true.
   # @param settings [Hash{Symbol => String}] A optional hash of settings. The
   #   default value and explanation of each option are documented in the
   #   DEFAULT_SETTINGS constant.
   # @return [Ballonizer] A new ballonizer instance.
   # @see Ballonizer.create_tables
   def initialize(db, settings = {})
-    @db = db
     @settings = DEFAULT_SETTINGS.merge(settings)
+    if db.is_a? String
+      db = Sequel::Database.connect(db)
+    end
+    if @settings[:create_tables_if_none] &&
+         ! (self.class.used_tables.any? { | name | db.table_exists? name })
+      self.class.create_tables(db)
+    end
+    @db = db
   end
 
   # Convenience method for process_submit_json, extract the json from the

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ballonizer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Henrique Becker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri