conjoin 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26372a3315431bf1e314994038c933d7a759ff67
-  data.tar.gz: d611e4998d57335d97c25c0dea5a17946ff15b3d
+  metadata.gz: 229e76464d2937ce690fa5075ce902aad53608cb
+  data.tar.gz: 13d06698cca5d5458e68c6c81d214d45a6a127ed
 SHA512:
-  metadata.gz: e50b133909a1cc983ab66eb1fd5a77aede90a9d9662eee0ca5592574d02a4ca003287aba75f233267f0e30e0bf385359b10a7576f17cd64402c5148c31ef2d65
-  data.tar.gz: fb544c0868d8e915c4bb89a2fe0767238b6fd6d94da0a3a5b9ead017e038644c99384d19ad5e64d4a78a46bde61fc4dadc71a98f817e2e7374942f957dd6bf0a
+  metadata.gz: df179a6cfd7f050559624393a019f9f9a78e85d312a1c4e7bd2f97ab39d30ad982408451be92ef66c052a43bee0a0e50beac2135af43460aa720a88f7835e9d2
+  data.tar.gz: 33d6cd1540f0e3eae89488f050897dff69d135f0114694469601529eb91f28aa4e7c6dff02bb341e6e7cba9548eeb01ac77c85027849880b92fcca5bc42293cb

data/lib/conjoin.rb

@@ -9,14 +9,6 @@ require "conjoin/seeds"
 module Conjoin
   extend ClassMethods
 
-  if not env.mounted?
-    require 'active_record'
-    require 'action_mailer'
-    require 'slim'
-    require "tilt/coffee"
-    require "tilt/sass"
-  end
-
   autoload :ActiveRecord, "conjoin/active_record"
   autoload :Assets      , "conjoin/assets"
   autoload :Auth        , "conjoin/auth"

data/lib/conjoin/active_record.rb

@@ -1,3 +1,9 @@
+require 'active_record'
+require 'enumerize'
+require 'protector'
+require 'mini_record'
+Protector::Adapters::ActiveRecord.activate!
+
 module Conjoin
   module ActiveRecord
     include ::ActiveRecord
@@ -7,14 +13,10 @@ module Conjoin
     end
 
     def self.setup app
-      require 'mini_record'
       self.app = app
       ActiveRecord::Base.send :include, Form
 
       if not Conjoin.env.mounted?
-        require 'enumerize'
-        require 'protector'
-        Protector::Adapters::ActiveRecord.activate!
         start_active_record
         ActiveRecord::Base.default_timezone = Time.zone
       end

data/lib/conjoin/assets.rb

@@ -1,3 +1,14 @@
+require 'mimemagic'
+require 'base64'
+require 'slim'
+require 'sass'
+require 'ostruct'
+require 'stylus'
+require 'stylus/tilt/stylus'
+require 'slim'
+require "tilt/coffee"
+require "tilt/sass"
+
 module Conjoin
   module Assets
     class << self
@@ -7,14 +18,6 @@ module Conjoin
     def self.setup app
       self.app = app
 
-      require 'mimemagic'
-      require 'base64'
-      require 'slim'
-      require 'sass'
-      require 'ostruct'
-      require 'stylus'
-      require 'stylus/tilt/stylus'
-
       # if ENV['RACK_ENV'] != 'production'
       #   require 'rugged'
       # end

data/lib/conjoin/version.rb

@@ -1,3 +1,3 @@
 module Conjoin
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjoin
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba