Skip to content
Browse files

Revert to 2.5.2 to workaround tciuro/NanoStore#68

  • Loading branch information...
1 parent c1af987 commit 61b05d4b49b08f1fdd27468db3df6b10ac030413 @siuying committed Jan 22, 2013
Showing with 1,191 additions and 1,439 deletions.
  1. +4 −0 CHANGELOG.md
  2. +1 −1 Rakefile
  3. +1 −1 lib/nano_store.rb
  4. +2 −2 nano-store.gemspec
  5. +3 −3 vendor/Podfile.lock
  6. +2 −2 vendor/Pods/Documentation/NanoStore/docset-installed.txt
  7. +3 −3 vendor/Pods/Documentation/NanoStore/docset/Contents/Info.plist
  8. +1 −1 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoBag.html
  9. +1 −1 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoEngine.html
  10. +1 −1 ...r/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoExpression.html
  11. +1 −1 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoObject.html
  12. +6 −6 ...or/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoPredicate.html
  13. +1 −1 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoResult.html
  14. +4 −65 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoSearch.html
  15. +2 −2 ...ds/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoSortDescriptor.html
  16. +1 −1 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoStore.html
  17. +1 −1 ...ods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFOrderedDictionary.html
  18. +1 −1 .../Documentation/NanoStore/docset/Contents/Resources/Documents/Protocols/NSFNanoObjectProtocol.html
  19. +4 −4 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/hierarchy.html
  20. +4 −4 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/index.html
  21. +1 −1 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Nodes.xml
  22. +6 −6 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Tokens5.xml
  23. +2 −24 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Tokens7.xml
  24. +2 −2 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Tokens8.xml
  25. BIN vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/docSet.dsidx
  26. BIN vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/docSet.skidx
  27. BIN vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/docSet.toc
  28. +1 −1 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoBag.html
  29. +1 −1 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoEngine.html
  30. +1 −1 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoExpression.html
  31. +1 −1 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoObject.html
  32. +6 −6 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoPredicate.html
  33. +1 −1 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoResult.html
  34. +4 −65 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoSearch.html
  35. +2 −2 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoSortDescriptor.html
  36. +1 −1 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoStore.html
  37. +1 −1 vendor/Pods/Documentation/NanoStore/html/Classes/NSFOrderedDictionary.html
  38. +1 −1 vendor/Pods/Documentation/NanoStore/html/Protocols/NSFNanoObjectProtocol.html
  39. +4 −4 vendor/Pods/Documentation/NanoStore/html/hierarchy.html
  40. +4 −4 vendor/Pods/Documentation/NanoStore/html/index.html
  41. +49 −40 vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.m
  42. +53 −42 vendor/Pods/NanoStore/Classes/Advanced/NSFNanoResult.m
  43. +89 −80 vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.m
  44. +13 −11 vendor/Pods/NanoStore/Classes/Public/NSFNanoExpression.m
  45. +1 −3 vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.h
  46. +0 −1 vendor/Pods/NanoStore/Classes/Public/NSFNanoGlobals.m
  47. +29 −34 vendor/Pods/NanoStore/Classes/Public/NSFNanoObject.m
  48. +5 −5 vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.h
  49. +34 −43 vendor/Pods/NanoStore/Classes/Public/NSFNanoPredicate.m
  50. +3 −5 vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.h
  51. +97 −171 vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m
  52. +1 −1 vendor/Pods/NanoStore/Classes/Public/NSFNanoSortDescriptor.h
  53. +12 −13 vendor/Pods/NanoStore/Classes/Public/NSFNanoSortDescriptor.m
  54. +82 −83 vendor/Pods/NanoStore/Classes/Public/NSFNanoStore.m
  55. +0 −36 vendor/Pods/NanoStore/Classes/Public/NanoStore.h
  56. +640 −648 vendor/Pods/Pods.bridgesupport
View
4 CHANGELOG.md
@@ -1,3 +1,7 @@
+# [0.6.2](https://github.com/siuying/NanoStoreInMotion/compare/v0.6.1%E2%80%A6v0.6.2)
+
+- Revert to NanoStore 2.5.3
+
# [0.6.1](https://github.com/siuying/NanoStoreInMotion/compare/v0.6.0%E2%80%A6v0.6.1)
- ```attributes``` method to add multiple attributes in one line (thanks @gouravtiwari)
View
2 Rakefile
@@ -9,7 +9,7 @@ Motion::Project::App.setup do |app|
app.redgreen_style = :full
app.files += Dir.glob(File.join(app.project_dir, 'lib/nano_store/*.rb'))
app.pods do
- pod 'NanoStore', '~> 2.5.7'
+ pod 'NanoStore', '2.5.2'
end
end
View
2 lib/nano_store.rb
@@ -16,5 +16,5 @@
app.files.unshift(File.join(File.dirname(__FILE__), 'nano_store/finder.rb'))
app.pods ||= Motion::Project::CocoaPods.new(app)
- app.pods.pod 'NanoStore', '~> 2.5.7'
+ app.pods.pod 'NanoStore', '2.5.2'
end
View
4 nano-store.gemspec
@@ -4,8 +4,8 @@ require File.expand_path('../lib/nano_store/version', __FILE__)
Gem::Specification.new do |gem|
gem.authors = ["Francis Chong"]
gem.email = ["francis@ignition.hk"]
- gem.description = "Wrapper for NanoStore, a lightweight schema-less key-value document database based on sqlite, for RubyMotion."
- gem.summary = "Wrapper for NanoStore, a lightweight schema-less key-value document database based on sqlite, for RubyMotion."
+ gem.description = "RubyMotion wrapper for NanoStore, a lightweight schema-less key-value document database based on sqlite."
+ gem.summary = "RubyMotion wrapper for NanoStore, a lightweight schema-less key-value document database based on sqlite."
gem.homepage = "https://github.com/siuying/NanoStoreInMotion"
gem.files = `git ls-files`.split($\)
View
6 vendor/Podfile.lock
@@ -1,11 +1,11 @@
PODS:
-- NanoStore (2.5.7)
+- NanoStore (2.5.2)
DEPENDENCIES:
-- NanoStore (~> 2.5.7)
+- NanoStore (= 2.5.2)
SPEC CHECKSUMS:
- NanoStore: bca650b45d05084acf1c5cfc1b75985f5ce1e197
+ NanoStore: eb22a867411f5ecdf3c959ba58fecd8b8af90e2b
COCOAPODS: 0.16.1
View
4 vendor/Pods/Documentation/NanoStore/docset-installed.txt
@@ -1,4 +1,4 @@
Documentation set was installed to Xcode!
-Path: /Users/siuying/Library/Developer/Shared/Documentation/DocSets/org.cocoapods.NanoStore-2.5.7.docset
-Time: 2013-01-22 07:56:31 +0000
+Path: /Users/siuying/Library/Developer/Shared/Documentation/DocSets/org.cocoapods.NanoStore-2.5.2.docset
+Time: 2013-01-22 09:31:56 +0000
View
6 vendor/Pods/Documentation/NanoStore/docset/Contents/Info.plist
@@ -5,9 +5,9 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleIdentifier</key>
- <string>org.cocoapods.NanoStore-2.5.7</string>
+ <string>org.cocoapods.NanoStore-2.5.2</string>
<key>CFBundleName</key>
- <string>NanoStore 2.5.7 Documentation</string>
+ <string>NanoStore 2.5.2 Documentation</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
@@ -18,7 +18,7 @@
<string>NanoStore is an open source, lightweight schema-less local key-value document store written in Objective-C for Mac OS X and iOS.</string>
<key>DocSetFeedName</key>
- <string>NanoStore 2.5.7 Documentation</string>
+ <string>NanoStore 2.5.2 Documentation</string>
<key>DocSetMinimumXcodeVersion</key>
<string>3.0</string>
View
2 .../Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoBag.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 ...ds/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoEngine.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 ...ocumentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoExpression.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 ...ds/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoObject.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
12 ...Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoPredicate.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
@@ -404,7 +404,7 @@ <h3 class="subsubtitle method-title">value</h3>
- <div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) id value</code></div>
+ <div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *value</code></div>
@@ -456,7 +456,7 @@ <h3 class="subsubtitle method-title">predicateWithColumn:matching:value:</h3>
- <div class="method-subsection method-declaration"><code>+ (NSFNanoPredicate *)predicateWithColumn:(NSFTableColumnType)<em>theType</em> matching:(NSFMatchType)<em>theMatch</em> value:(id)<em>theValue</em></code></div>
+ <div class="method-subsection method-declaration"><code>+ (NSFNanoPredicate *)predicateWithColumn:(NSFTableColumnType)<em>theType</em> matching:(NSFMatchType)<em>theMatch</em> value:(NSString *)<em>theValue</em></code></div>
@@ -475,7 +475,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
<dl class="argument-def parameter-def">
<dt><em>theValue</em></dt>
- <dd><p>can be an NSString or [NSNull null]</p></dd>
+ <dd><p>is the <a href="#//api/name/value">value</a>.</p></dd>
</dl>
</div>
@@ -621,7 +621,7 @@ <h3 class="subsubtitle method-title">initWithColumn:matching:value:</h3>
- <div class="method-subsection method-declaration"><code>- (id)initWithColumn:(NSFTableColumnType)<em>theType</em> matching:(NSFMatchType)<em>theMatch</em> value:(id)<em>theValue</em></code></div>
+ <div class="method-subsection method-declaration"><code>- (id)initWithColumn:(NSFTableColumnType)<em>theType</em> matching:(NSFMatchType)<em>theMatch</em> value:(NSString *)<em>theValue</em></code></div>
@@ -640,7 +640,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
<dl class="argument-def parameter-def">
<dt><em>theValue</em></dt>
- <dd><p>can be an NSString or [NSNull null]</p></dd>
+ <dd><p>is the <a href="#//api/name/value">value</a>.</p></dd>
</dl>
</div>
View
2 ...ds/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoResult.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
69 ...ds/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoSearch.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
@@ -44,8 +44,6 @@ <h1 class="hideInXcode">NSFNanoSearch Class Reference</h1>
<option value="//api/name/attributesToBeReturned">&nbsp;&nbsp;&nbsp;&nbsp;attributesToBeReturned</option>
- <option value="//api/name/bag">&nbsp;&nbsp;&nbsp;&nbsp;bag</option>
-
<option value="//api/name/expressions">&nbsp;&nbsp;&nbsp;&nbsp;expressions</option>
<option value="//api/name/filterClass">&nbsp;&nbsp;&nbsp;&nbsp;filterClass</option>
@@ -164,8 +162,6 @@ <h1 class="hideInXcode">NSFNanoSearch Class Reference</h1>
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/attributesToBeReturned">attributesToBeReturned</a></span></li>
- <li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/bag">bag</a></span></li>
-
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/expressions">expressions</a></span></li>
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/filterClass">filterClass</a></span></li>
@@ -556,16 +552,6 @@ <h3 class="subsubtitle task-title">Other Methods</h3>
</span>
<span class="task-item-suffix">property</span>
-</li><li>
- <span class="tooltip">
- <code><a href="#//api/name/bag">&nbsp;&nbsp;bag</a></code>
- <span class="tooltip"><ul>
-<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
-</ul>
-</span>
- </span>
- <span class="task-item-suffix">property</span>
-
</li>
</ul>
@@ -909,53 +895,6 @@ <h4 class="method-subtitle">Declared In</h4>
</div>
<div class="section-method">
- <a name="//api/name/bag" title="bag"></a>
- <h3 class="subsubtitle method-title">bag</h3>
-
-
-
- <div class="method-subsection brief-description">
- <ul>
-<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
-</ul>
-
- </div>
-
-
-
- <div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readwrite) NSFNanoBag *bag</code></div>
-
-
-
-
-
-
-
-
-
- <div class="method-subsection discussion-section">
- <h4 class="method-subtitle">Discussion</h4>
- <ul>
-<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
-</ul>
-
- </div>
-
-
-
-
-
-
-
- <div class="method-subsection declared-in-section">
- <h4 class="method-subtitle">Declared In</h4>
- <code class="declared-in-ref">NSFNanoSearch.h</code><br />
- </div>
-
-
-</div>
-
- <div class="section-method">
<a name="//api/name/expressions" title="expressions"></a>
<h3 class="subsubtitle method-title">expressions</h3>
@@ -1017,7 +956,7 @@ <h3 class="subsubtitle method-title">filterClass</h3>
- <div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readwrite) NSString *filterClass</code></div>
+ <div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readwrite) NSString *filterClass</code></div>
@@ -2332,7 +2271,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
<div class="method-subsection discussion-section">
<h4 class="method-subtitle">Discussion</h4>
- <p>Performs a search using the values of the properties before, on or after a given date.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when the return type is NSFReturnKeys.</p></div>
+ <p>Performs a search using the values of the properties before, on or after a given date.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when returning requesting NSFReturnKeys.</p></div>
</div>
@@ -2402,7 +2341,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
<div class="method-subsection discussion-section">
<h4 class="method-subtitle">Discussion</h4>
- <p>Performs a search using the values of the properties.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when the return type is NSFReturnKeys.</p></div>
+ <p>Performs a search using the values of the properties.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when returning requesting NSFReturnKeys.</p></div>
</div>
View
4 ...entation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoSortDescriptor.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
@@ -296,7 +296,7 @@ <h3 class="subsubtitle method-title">attribute</h3>
- <div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *attribute</code></div>
+ <div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSString *attribute</code></div>
View
2 ...ods/Documentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFNanoStore.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 ...mentation/NanoStore/docset/Contents/Resources/Documents/Classes/NSFOrderedDictionary.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 ...tation/NanoStore/docset/Contents/Resources/Documents/Protocols/NSFNanoObjectProtocol.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
8 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/hierarchy.html
@@ -2,20 +2,20 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>NanoStore 2.5.7 Hierarchy</title>
+ <title>NanoStore 2.5.2 Hierarchy</title>
<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
<meta name="generator" content="appledoc 2.0.5 (build 789)" />
</head>
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="index.html">Tito Ciuro</a>
</div>
<div id="title" role="banner">
- <h1 class="hideInXcode">NanoStore 2.5.7 Hierarchy</h1>
+ <h1 class="hideInXcode">NanoStore 2.5.2 Hierarchy</h1>
</div>
<ul id="headerButtons" role="toolbar"></ul>
</header>
@@ -26,7 +26,7 @@ <h1 class="hideInXcode">NanoStore 2.5.7 Hierarchy</h1>
</div>
<div id="header">
<div class="section-header">
- <h1 class="title title-header">NanoStore 2.5.7 Hierarchy</h1>
+ <h1 class="title title-header">NanoStore 2.5.2 Hierarchy</h1>
</div>
</div>
<div id="container">
View
8 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Documents/index.html
@@ -2,20 +2,20 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>NanoStore 2.5.7 Reference</title>
+ <title>NanoStore 2.5.2 Reference</title>
<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
<meta name="generator" content="appledoc 2.0.5 (build 789)" />
</head>
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="index.html">Tito Ciuro</a>
</div>
<div id="title" role="banner">
- <h1 class="hideInXcode">NanoStore 2.5.7 Reference</h1>
+ <h1 class="hideInXcode">NanoStore 2.5.2 Reference</h1>
</div>
<ul id="headerButtons" role="toolbar"></ul>
</header>
@@ -26,7 +26,7 @@ <h1 class="hideInXcode">NanoStore 2.5.7 Reference</h1>
</div>
<div id="header">
<div class="section-header">
- <h1 class="title title-header">NanoStore 2.5.7 Reference</h1>
+ <h1 class="title title-header">NanoStore 2.5.2 Reference</h1>
</div>
</div>
<div id="container">
View
2 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Nodes.xml
@@ -2,7 +2,7 @@
<DocSetNodes version="1.0">
<TOC>
<Node type="folder">
- <Name>NanoStore 2.5.7</Name>
+ <Name>NanoStore 2.5.2</Name>
<Path>index.html</Path>
<Subnodes>
View
12 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Tokens5.xml
@@ -69,7 +69,7 @@ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStor
<Abstract type="html">* The value to be used for comparison.</Abstract>
<DeclaredIn>NSFNanoPredicate.h</DeclaredIn>
- <Declaration>@property (nonatomic, readonly) id value</Declaration>
+ <Declaration>@property (nonatomic, copy, readonly) NSString *value</Declaration>
<Anchor>//api/name/value</Anchor>
@@ -80,7 +80,7 @@ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStor
<Abstract type="html">* The value to be used for comparison.</Abstract>
<DeclaredIn>NSFNanoPredicate.h</DeclaredIn>
- <Declaration>@property (nonatomic, readonly) id value</Declaration>
+ <Declaration>@property (nonatomic, copy, readonly) NSString *value</Declaration>
<Anchor>//api/name/value</Anchor>
@@ -96,7 +96,7 @@ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStor
</RelatedTokens>
- <Declaration>+ (NSFNanoPredicate *)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue</Declaration>
+ <Declaration>+ (NSFNanoPredicate *)predicateWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue</Declaration>
<Parameters>
<Parameter>
<Name>theType</Name>
@@ -106,7 +106,7 @@ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStor
<Abstract type="html">is the match operator.</Abstract>
</Parameter><Parameter>
<Name>theValue</Name>
- <Abstract type="html">can be an NSString or [NSNull null]</Abstract>
+ <Abstract type="html">is the value.</Abstract>
</Parameter>
</Parameters>
<ReturnValue><Abstract type="html">A predicate which can be used in an NSFNanoExpression.</Abstract></ReturnValue>
@@ -123,7 +123,7 @@ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStor
</RelatedTokens>
- <Declaration>- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(id)theValue</Declaration>
+ <Declaration>- (id)initWithColumn:(NSFTableColumnType)theType matching:(NSFMatchType)theMatch value:(NSString *)theValue</Declaration>
<Parameters>
<Parameter>
<Name>theType</Name>
@@ -133,7 +133,7 @@ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStor
<Abstract type="html">is the match operator.</Abstract>
</Parameter><Parameter>
<Name>theValue</Name>
- <Abstract type="html">can be an NSString or [NSNull null]</Abstract>
+ <Abstract type="html">is the value.</Abstract>
</Parameter>
</Parameters>
<ReturnValue><Abstract type="html">A predicate which can be used in an NSFNanoExpression.</Abstract></ReturnValue>
View
26 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Tokens7.xml
@@ -269,7 +269,7 @@
<Abstract type="html">* The filterClass allows to filter the results based on a specific object class.</Abstract>
<DeclaredIn>NSFNanoSearch.h</DeclaredIn>
- <Declaration>@property (nonatomic, copy, readwrite) NSString *filterClass</Declaration>
+ <Declaration>@property (nonatomic, strong, readwrite) NSString *filterClass</Declaration>
<Anchor>//api/name/filterClass</Anchor>
@@ -280,7 +280,7 @@
<Abstract type="html">* The filterClass allows to filter the results based on a specific object class.</Abstract>
<DeclaredIn>NSFNanoSearch.h</DeclaredIn>
- <Declaration>@property (nonatomic, copy, readwrite) NSString *filterClass</Declaration>
+ <Declaration>@property (nonatomic, strong, readwrite) NSString *filterClass</Declaration>
<Anchor>//api/name/filterClass</Anchor>
@@ -331,28 +331,6 @@
</Token>
<Token>
- <TokenIdentifier>//apple_ref/occ/instm/NSFNanoSearch/setBag:</TokenIdentifier>
- <Abstract type="html">* limit a Search to a particular bag.</Abstract>
- <DeclaredIn>NSFNanoSearch.h</DeclaredIn>
-
- <Declaration>@property (nonatomic, assign, readwrite) NSFNanoBag *bag</Declaration>
-
-
- <Anchor>//api/name/bag</Anchor>
- </Token>
-
- <Token>
- <TokenIdentifier>//apple_ref/occ/instp/NSFNanoSearch/bag</TokenIdentifier>
- <Abstract type="html">* limit a Search to a particular bag.</Abstract>
- <DeclaredIn>NSFNanoSearch.h</DeclaredIn>
-
- <Declaration>@property (nonatomic, assign, readwrite) NSFNanoBag *bag</Declaration>
-
-
- <Anchor>//api/name/bag</Anchor>
- </Token>
-
- <Token>
<TokenIdentifier>//apple_ref/occ/clm/NSFNanoSearch/searchWithStore:</TokenIdentifier>
<Abstract type="html">Creates and returns a search element for a given document store.</Abstract>
<DeclaredIn>NSFNanoSearch.h</DeclaredIn>
View
4 vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/Tokens8.xml
@@ -22,7 +22,7 @@ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStor
<Abstract type="html">* The property key to use when performing a comparison</Abstract>
<DeclaredIn>NSFNanoSortDescriptor.h</DeclaredIn>
- <Declaration>@property (nonatomic, copy, readonly) NSString *attribute</Declaration>
+ <Declaration>@property (nonatomic, readonly) NSString *attribute</Declaration>
<Anchor>//api/name/attribute</Anchor>
@@ -33,7 +33,7 @@ NSFNanoStore *nanoStore = [NSFNanoStore createAndOpenStoreWithType:NSFMemoryStor
<Abstract type="html">* The property key to use when performing a comparison</Abstract>
<DeclaredIn>NSFNanoSortDescriptor.h</DeclaredIn>
- <Declaration>@property (nonatomic, copy, readonly) NSString *attribute</Declaration>
+ <Declaration>@property (nonatomic, readonly) NSString *attribute</Declaration>
<Anchor>//api/name/attribute</Anchor>
View
BIN vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/docSet.dsidx
Binary file not shown.
View
BIN vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/docSet.skidx
Binary file not shown.
View
BIN vendor/Pods/Documentation/NanoStore/docset/Contents/Resources/docSet.toc
Binary file not shown.
View
2 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoBag.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoEngine.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoExpression.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoObject.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
12 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoPredicate.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
@@ -404,7 +404,7 @@ <h3 class="subsubtitle method-title">value</h3>
- <div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) id value</code></div>
+ <div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *value</code></div>
@@ -456,7 +456,7 @@ <h3 class="subsubtitle method-title">predicateWithColumn:matching:value:</h3>
- <div class="method-subsection method-declaration"><code>+ (NSFNanoPredicate *)predicateWithColumn:(NSFTableColumnType)<em>theType</em> matching:(NSFMatchType)<em>theMatch</em> value:(id)<em>theValue</em></code></div>
+ <div class="method-subsection method-declaration"><code>+ (NSFNanoPredicate *)predicateWithColumn:(NSFTableColumnType)<em>theType</em> matching:(NSFMatchType)<em>theMatch</em> value:(NSString *)<em>theValue</em></code></div>
@@ -475,7 +475,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
<dl class="argument-def parameter-def">
<dt><em>theValue</em></dt>
- <dd><p>can be an NSString or [NSNull null]</p></dd>
+ <dd><p>is the <a href="#//api/name/value">value</a>.</p></dd>
</dl>
</div>
@@ -621,7 +621,7 @@ <h3 class="subsubtitle method-title">initWithColumn:matching:value:</h3>
- <div class="method-subsection method-declaration"><code>- (id)initWithColumn:(NSFTableColumnType)<em>theType</em> matching:(NSFMatchType)<em>theMatch</em> value:(id)<em>theValue</em></code></div>
+ <div class="method-subsection method-declaration"><code>- (id)initWithColumn:(NSFTableColumnType)<em>theType</em> matching:(NSFMatchType)<em>theMatch</em> value:(NSString *)<em>theValue</em></code></div>
@@ -640,7 +640,7 @@ <h4 class="method-subtitle parameter-title">Parameters</h4>
<dl class="argument-def parameter-def">
<dt><em>theValue</em></dt>
- <dd><p>can be an NSString or [NSNull null]</p></dd>
+ <dd><p>is the <a href="#//api/name/value">value</a>.</p></dd>
</dl>
</div>
View
2 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoResult.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
69 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoSearch.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
@@ -44,8 +44,6 @@ <h1 class="hideInXcode">NSFNanoSearch Class Reference</h1>
<option value="//api/name/attributesToBeReturned">&nbsp;&nbsp;&nbsp;&nbsp;attributesToBeReturned</option>
- <option value="//api/name/bag">&nbsp;&nbsp;&nbsp;&nbsp;bag</option>
-
<option value="//api/name/expressions">&nbsp;&nbsp;&nbsp;&nbsp;expressions</option>
<option value="//api/name/filterClass">&nbsp;&nbsp;&nbsp;&nbsp;filterClass</option>
@@ -164,8 +162,6 @@ <h1 class="hideInXcode">NSFNanoSearch Class Reference</h1>
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/attributesToBeReturned">attributesToBeReturned</a></span></li>
- <li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/bag">bag</a></span></li>
-
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/expressions">expressions</a></span></li>
<li><span class="nodisclosure"></span><span class="sectionName"><a href="#//api/name/filterClass">filterClass</a></span></li>
@@ -556,16 +552,6 @@ <h3 class="subsubtitle task-title">Other Methods</h3>
</span>
<span class="task-item-suffix">property</span>
-</li><li>
- <span class="tooltip">
- <code><a href="#//api/name/bag">&nbsp;&nbsp;bag</a></code>
- <span class="tooltip"><ul>
-<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
-</ul>
-</span>
- </span>
- <span class="task-item-suffix">property</span>
-
</li>
</ul>
@@ -909,53 +895,6 @@ <h4 class="method-subtitle">Declared In</h4>
</div>
<div class="section-method">
- <a name="//api/name/bag" title="bag"></a>
- <h3 class="subsubtitle method-title">bag</h3>
-
-
-
- <div class="method-subsection brief-description">
- <ul>
-<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
-</ul>
-
- </div>
-
-
-
- <div class="method-subsection method-declaration"><code>@property (nonatomic, assign, readwrite) NSFNanoBag *bag</code></div>
-
-
-
-
-
-
-
-
-
- <div class="method-subsection discussion-section">
- <h4 class="method-subtitle">Discussion</h4>
- <ul>
-<li><a href="#//api/name/limit">limit</a> a Search to a particular bag.</li>
-</ul>
-
- </div>
-
-
-
-
-
-
-
- <div class="method-subsection declared-in-section">
- <h4 class="method-subtitle">Declared In</h4>
- <code class="declared-in-ref">NSFNanoSearch.h</code><br />
- </div>
-
-
-</div>
-
- <div class="section-method">
<a name="//api/name/expressions" title="expressions"></a>
<h3 class="subsubtitle method-title">expressions</h3>
@@ -1017,7 +956,7 @@ <h3 class="subsubtitle method-title">filterClass</h3>
- <div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readwrite) NSString *filterClass</code></div>
+ <div class="method-subsection method-declaration"><code>@property (nonatomic, strong, readwrite) NSString *filterClass</code></div>
@@ -2332,7 +2271,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
<div class="method-subsection discussion-section">
<h4 class="method-subtitle">Discussion</h4>
- <p>Performs a search using the values of the properties before, on or after a given date.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when the return type is NSFReturnKeys.</p></div>
+ <p>Performs a search using the values of the properties before, on or after a given date.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when returning requesting NSFReturnKeys.</p></div>
</div>
@@ -2402,7 +2341,7 @@ <h4 class="method-subtitle parameter-title">Return Value</h4>
<div class="method-subsection discussion-section">
<h4 class="method-subtitle">Discussion</h4>
- <p>Performs a search using the values of the properties.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when the return type is NSFReturnKeys.</p></div>
+ <p>Performs a search using the values of the properties.</p><div class="note"><p><strong>Note:</strong> The <a href="#//api/name/sort">sort</a> descriptor will be ignored when returning requesting NSFReturnKeys.</p></div>
</div>
View
4 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoSortDescriptor.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
@@ -296,7 +296,7 @@ <h3 class="subsubtitle method-title">attribute</h3>
- <div class="method-subsection method-declaration"><code>@property (nonatomic, copy, readonly) NSString *attribute</code></div>
+ <div class="method-subsection method-declaration"><code>@property (nonatomic, readonly) NSString *attribute</code></div>
View
2 vendor/Pods/Documentation/NanoStore/html/Classes/NSFNanoStore.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 vendor/Pods/Documentation/NanoStore/html/Classes/NSFOrderedDictionary.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
2 vendor/Pods/Documentation/NanoStore/html/Protocols/NSFNanoObjectProtocol.html
@@ -12,7 +12,7 @@
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="../index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="../index.html">Tito Ciuro</a>
</div>
View
8 vendor/Pods/Documentation/NanoStore/html/hierarchy.html
@@ -2,20 +2,20 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>NanoStore 2.5.7 Hierarchy</title>
+ <title>NanoStore 2.5.2 Hierarchy</title>
<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
<meta name="generator" content="appledoc 2.0.5 (build 789)" />
</head>
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="index.html">Tito Ciuro</a>
</div>
<div id="title" role="banner">
- <h1 class="hideInXcode">NanoStore 2.5.7 Hierarchy</h1>
+ <h1 class="hideInXcode">NanoStore 2.5.2 Hierarchy</h1>
</div>
<ul id="headerButtons" role="toolbar"></ul>
</header>
@@ -26,7 +26,7 @@ <h1 class="hideInXcode">NanoStore 2.5.7 Hierarchy</h1>
</div>
<div id="header">
<div class="section-header">
- <h1 class="title title-header">NanoStore 2.5.7 Hierarchy</h1>
+ <h1 class="title title-header">NanoStore 2.5.2 Hierarchy</h1>
</div>
</div>
<div id="container">
View
8 vendor/Pods/Documentation/NanoStore/html/index.html
@@ -2,20 +2,20 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>NanoStore 2.5.7 Reference</title>
+ <title>NanoStore 2.5.2 Reference</title>
<link rel="stylesheet" type="text/css" href="css/styles.css" media="all" />
<link rel="stylesheet" type="text/css" media="print" href="css/stylesPrint.css" />
<meta name="generator" content="appledoc 2.0.5 (build 789)" />
</head>
<body>
<header id="top_header">
<div id="library" class="hideInXcode">
- <h1><a id="libraryTitle" href="index.html">NanoStore 2.5.7 </a></h1>
+ <h1><a id="libraryTitle" href="index.html">NanoStore 2.5.2 </a></h1>
<a id="developerHome" href="index.html">Tito Ciuro</a>
</div>
<div id="title" role="banner">
- <h1 class="hideInXcode">NanoStore 2.5.7 Reference</h1>
+ <h1 class="hideInXcode">NanoStore 2.5.2 Reference</h1>
</div>
<ul id="headerButtons" role="toolbar"></ul>
</header>
@@ -26,7 +26,7 @@ <h1 class="hideInXcode">NanoStore 2.5.7 Reference</h1>
</div>
<div id="header">
<div class="section-header">
- <h1 class="title title-header">NanoStore 2.5.7 Reference</h1>
+ <h1 class="title title-header">NanoStore 2.5.2 Reference</h1>
</div>
</div>
<div id="container">
View
89 vendor/Pods/NanoStore/Classes/Advanced/NSFNanoEngine.m
@@ -45,19 +45,23 @@
#pragma mark -
-@interface NSFNanoEngine ()
-
-/** \cond */
-@property (nonatomic, weak) sqlite3 *sqlite;
-@property (nonatomic, copy, readwrite) NSString *path;
-@property (nonatomic) NSMutableDictionary *schema;
-@property (nonatomic) BOOL willCommitChangeSchema;
-@property (nonatomic) unsigned int busyTimeout;
-/** \endcond */
-
-@end
-
@implementation NSFNanoEngine
+{
+@protected
+ sqlite3 *sqlite;
+ NSString *path;
+ NSFCacheMethod cacheMethod;
+
+ /** \cond */
+ NSMutableDictionary *schema;
+ BOOL willCommitChangeSchema;
+ unsigned int busyTimeout;
+ /** \endcond */
+}
+
+@synthesize sqlite;
+@synthesize path;
+@synthesize cacheMethod;
#pragma mark -
@@ -83,7 +87,7 @@ - (id)initWithPath:(NSString *)thePath
userInfo:nil]raise];
if ((self = [self init])) {
- _path = thePath;
+ path = [thePath copy];
}
return self;
@@ -99,8 +103,8 @@ + (void)initialize
- (id)init
{
if ((self = [super init])) {
- _path = nil;
- _schema = nil;
+ path = nil;
+ schema = nil;
}
return self;
}
@@ -122,7 +126,7 @@ - (NSFOrderedDictionary *)dictionaryDescription
NSFOrderedDictionary *values = [NSFOrderedDictionary new];
values[@"SQLite address"] = [NSString stringWithFormat:@"%p", self.sqlite];
- values[@"Database path"] = _path;
+ values[@"Database path"] = path;
values[@"Cache method"] = [self NSFP_cacheMethodToString];
return values;
@@ -144,7 +148,7 @@ - (NSString *)JSONDescription
- (BOOL)openWithCacheMethod:(NSFCacheMethod)theCacheMethod useFastMode:(BOOL)useFastMode
{
- int status = sqlite3_open_v2( [_path UTF8String], &_sqlite,
+ int status = sqlite3_open_v2( [path UTF8String], &sqlite,
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_AUTOPROXY | SQLITE_OPEN_FULLMUTEX, NULL);
// Set NanoStoreEngine's page size to match the system current page size
@@ -162,7 +166,7 @@ - (BOOL)openWithCacheMethod:(NSFCacheMethod)theCacheMethod useFastMode:(BOOL)use
if ((SQLITE_OK != status) || (sqlite3_extended_result_codes(self.sqlite, 1) != SQLITE_OK))
return NO;
- if ([[_path lowercaseString]isEqualToString:NSFMemoryDatabase] == YES) {
+ if ([[path lowercaseString]isEqualToString:NSFMemoryDatabase] == YES) {
sqlite3_exec(self.sqlite, "PRAGMA fullfsync = OFF;", NULL, NULL, NULL);
sqlite3_exec(self.sqlite, "PRAGMA temp_store = MEMORY", NULL, NULL, NULL);
@@ -188,7 +192,7 @@ - (BOOL)openWithCacheMethod:(NSFCacheMethod)theCacheMethod useFastMode:(BOOL)use
}
// Save whether we want data to be fetched lazily
- _cacheMethod = theCacheMethod;
+ cacheMethod = theCacheMethod;
[self setBusyTimeout:250];
@@ -225,7 +229,7 @@ - (BOOL)close
}
int status = sqlite3_close(self.sqlite);
- _sqlite = NULL;
+ sqlite = NULL;
// Since we're operating with extended result code support, extract the bits
// and obtain the regular result code
@@ -248,7 +252,7 @@ - (BOOL)beginTransaction
if (YES == [self isTransactionActive])
return NO;
- _willCommitChangeSchema = NO;
+ willCommitChangeSchema = NO;
return [self beginDeferredTransaction];
}
@@ -258,41 +262,41 @@ - (BOOL)beginDeferredTransaction
if (YES == [self isTransactionActive])
return NO;
- _willCommitChangeSchema = NO;
+ willCommitChangeSchema = NO;
return [self NSFP_beginTransactionMode:@"BEGIN DEFERRED TRANSACTION;"];
}
- (BOOL)commitTransaction
{
if (NO == [self isTransactionActive]) {
- _willCommitChangeSchema = NO;
+ willCommitChangeSchema = NO;
return NO;
}
- if (NO == _willCommitChangeSchema)
+ if (NO == willCommitChangeSchema)
[self NSFP_uninstallCommitCallback];
BOOL success = (nil == [[self executeSQL:@"COMMIT TRANSACTION;"]error]);
- if (NO == _willCommitChangeSchema)
+ if (NO == willCommitChangeSchema)
[self NSFP_installCommitCallback];
- _willCommitChangeSchema = NO;
+ willCommitChangeSchema = NO;
return success;
}
- (BOOL)rollbackTransaction
{
if ([self isTransactionActive] == NO) {
- _willCommitChangeSchema = NO;
+ willCommitChangeSchema = NO;
return NO;
}
BOOL success = (nil == [[self executeSQL:@"ROLLBACK TRANSACTION;"]error]);
- _willCommitChangeSchema = NO;
+ willCommitChangeSchema = NO;
return success;
}
@@ -713,9 +717,14 @@ - (void)setBusyTimeout:(unsigned int)theTimeout
theTimeout = 250;
}
- _busyTimeout = theTimeout;
+ busyTimeout = theTimeout;
- sqlite3_busy_timeout(self.sqlite, _busyTimeout);
+ sqlite3_busy_timeout(self.sqlite, busyTimeout);
+}
+
+- (unsigned int)busyTimeout
+{
+ return busyTimeout;
}
+ (NSInteger)systemPageSize
@@ -1069,7 +1078,7 @@ + (NSArray *)NSFP_sharedROWIDKeywords
- (NSString *)NSFP_cacheMethodToString
{
- switch (_cacheMethod) {
+ switch (cacheMethod) {
case CacheAllData:
return @"Cache all data";
break;
@@ -1181,8 +1190,8 @@ - (NSFNanoDatatype)NSFP_datatypeForTable:(NSString *)table column:(NSString *)co
NSString *datatype = nil;
// Check to see if the schema has been cached; take advantage of it if possible...
- if (nil != _schema) {
- datatype = [[_schema objectForKey:table]objectForKey:column];
+ if (nil != schema) {
+ datatype = [[schema objectForKey:table]objectForKey:column];
if (nil == datatype) datatype = NSFStringFromNanoDataType(NSFNanoTypeUnknown);
} else {
NSString *theSQLStatement = [NSString stringWithFormat:@"SELECT %@ from %@ WHERE %@ = '%@' AND %@ = '%@';", NSFP_DatatypeIdentifier, NSFP_SchemaTable, NSFP_TableIdentifier, table, NSFP_ColumnIdentifier, column];
@@ -1193,14 +1202,14 @@ - (NSFNanoDatatype)NSFP_datatypeForTable:(NSString *)table column:(NSString *)co
if (nil == datatype) datatype = NSFStringFromNanoDataType(NSFNanoTypeUnknown);
- NSMutableDictionary *tempSchema = [_schema objectForKey:table];
+ NSMutableDictionary *tempSchema = [schema objectForKey:table];
if (nil != tempSchema)
tempSchema = [[NSMutableDictionary alloc]init];
else
;
[tempSchema setObject:datatype forKey:column];
- [_schema setObject:tempSchema forKey:table];
+ [schema setObject:tempSchema forKey:table];
tempSchema = nil;
}
@@ -1504,8 +1513,8 @@ - (BOOL)NSFP_removeColumn:(NSString *)column fromTable:(NSString *)table
- (void)NSFP_rebuildDatatypeCache
{
// Cleanup
- _schema = nil;
- _schema = [[NSMutableDictionary alloc]init];
+ schema = nil;
+ schema = [[NSMutableDictionary alloc]init];
NSArray *tables = [self NSFP_flattenAllTables];
if ([tables count] == 0)
@@ -1526,7 +1535,7 @@ - (void)NSFP_rebuildDatatypeCache
[tableDictionary setObject:[datatypes objectAtIndex:j] forKey:[columns objectAtIndex:j]];
}
- [_schema setObject:tableDictionary forKey:table];
+ [schema setObject:tableDictionary forKey:table];
}
}
@@ -1729,8 +1738,8 @@ - (BOOL)NSFP_isColumnROWIDAlias:(NSString *)column forTable:(NSString *)table
NSString *rowUIDDatatype = NSFStringFromNanoDataType(NSFNanoTypeRowUID);
- if (nil != _schema)
- return [[[_schema objectForKey:table]objectForKey:column]isEqualToString:rowUIDDatatype];
+ if (nil != schema)
+ return [[[schema objectForKey:table]objectForKey:column]isEqualToString:rowUIDDatatype];
NSString *theSQLStatement = [NSString stringWithFormat:@"SELECT %@ FROM %@ WHERE %@ = '%@' AND %@ = '%@';", NSFP_DatatypeIdentifier, NSFP_SchemaTable, NSFP_TableIdentifier, table, NSFP_ColumnIdentifier, column];
NSFNanoResult* result = [self executeSQL:theSQLStatement];
View
95 vendor/Pods/NanoStore/Classes/Advanced/NSFNanoResult.m
@@ -27,17 +27,16 @@
#import "NSFNanoResult.h"
#import "NanoStore_Private.h"
-@interface NSFNanoResult ()
-
-/** \cond */
-@property (nonatomic, assign, readwrite) NSUInteger numberOfRows;
-@property (nonatomic, strong, readwrite) NSError *error;
-@property (nonatomic) NSDictionary *results;
-/** \endcond */
-
-@end
-
@implementation NSFNanoResult
+{
+@protected
+ /** \cond */
+ NSDictionary *results;
+ /** \endcond */
+}
+
+@synthesize numberOfRows;
+@synthesize error;
/** \cond */
@@ -58,24 +57,24 @@ - (void)dealloc
- (NSString *)description
{
- NSUInteger numberOfColumns = [[_results allKeys]count];
+ NSUInteger numberOfColumns = [[results allKeys]count];
NSMutableString *description = [NSMutableString string];
[description appendString:@"\n"];
[description appendString:[NSString stringWithFormat:@"Result address : %p\n", self]];
[description appendString:[NSString stringWithFormat:@"Number of columns : %ld\n", numberOfColumns]];
- if (nil == _error)
+ if (nil == error)
if ([[self columns]count] > 0)
[description appendString:[NSString stringWithFormat:@"Columns : %@\n", [[self columns]componentsJoinedByString:@", "]]];
else
[description appendString:[NSString stringWithFormat:@"Columns : %@\n", @"()"]];
else
[description appendString:[NSString stringWithFormat:@"Columns : %@\n", @"<column info not available>"]];
- [description appendString:[NSString stringWithFormat:@"Number of rows : %ld\n", _numberOfRows]];
- if (nil == _error)
+ [description appendString:[NSString stringWithFormat:@"Number of rows : %ld\n", numberOfRows]];
+ if (nil == error)
[description appendString:[NSString stringWithFormat:@"Error : %@\n", @"<no error>"]];
else
- [description appendString:[NSString stringWithFormat:@"Error : %@\n", [_error localizedDescription]]];
+ [description appendString:[NSString stringWithFormat:@"Error : %@\n", [error localizedDescription]]];
// Print up to the first ten rows to help visualize the cursor
if (0 != numberOfColumns) {
@@ -106,11 +105,11 @@ - (NSString *)description
}
// Print the preview of the contents
- if (_numberOfRows > 0) {
- NSInteger numberOfRowsToPrint = _numberOfRows;
+ if (numberOfRows > 0) {
+ NSInteger numberOfRowsToPrint = numberOfRows;
NSUInteger j;
- if (_numberOfRows > 100) {
+ if (numberOfRows > 100) {
numberOfRowsToPrint = 100;
}
@@ -142,13 +141,13 @@ - (NSString *)description
- (NSFOrderedDictionary *)dictionaryDescription
{
- NSUInteger numberOfColumns = [[_results allKeys]count];
+ NSUInteger numberOfColumns = [[results allKeys]count];
NSFOrderedDictionary *values = [NSFOrderedDictionary new];
values[@"Result address"] = [NSString stringWithFormat:@"%p", self];
values[@"Number of columns"] = @(numberOfColumns);
- if (nil == _error) {
+ if (nil == error) {
if ([[self columns]count] > 0) {
values[@"Columns"] = [[self columns]componentsJoinedByString:@", "];
} else {
@@ -157,11 +156,11 @@ - (NSFOrderedDictionary *)dictionaryDescription
} else {
values[@"Columns"] = @"<column info not available>";
}
- values[@"Number of rows"] = @(_numberOfRows);
- if (nil == _error) {
+ values[@"Number of rows"] = @(numberOfRows);
+ if (nil == error) {
values[@"Error"] = @"<nil>";
} else {
- values[@"Error"] = [NSString stringWithFormat:@"%@", [_error localizedDescription]];
+ values[@"Error"] = [NSString stringWithFormat:@"%@", [error localizedDescription]];
}
// Print up to the first ten rows to help visualize the cursor
@@ -197,11 +196,11 @@ - (NSFOrderedDictionary *)dictionaryDescription
[printedContent addObject:[contentString copy]];
// Print the preview of the contents
- if (_numberOfRows > 0) {
- NSInteger numberOfRowsToPrint = _numberOfRows;
+ if (numberOfRows > 0) {
+ NSInteger numberOfRowsToPrint = numberOfRows;
NSUInteger j;
- if (_numberOfRows > 100) {
+ if (numberOfRows > 100) {
numberOfRowsToPrint = 100;
}
@@ -252,17 +251,17 @@ - (NSString *)JSONDescription
- (NSArray *)columns
{
- return [_results allKeys];
+ return [results allKeys];
}
- (NSString *)valueAtIndex:(NSUInteger)index forColumn:(NSString *)column
{
- return [[_results objectForKey:column]objectAtIndex:index];
+ return [[results objectForKey:column]objectAtIndex:index];
}
- (NSArray *)valuesForColumn:(NSString *)column
{
- NSArray *values = [_results objectForKey:column];
+ NSArray *values = [results objectForKey:column];
if (nil == values)
values = [NSArray array];
@@ -272,17 +271,22 @@ - (NSArray *)valuesForColumn:(NSString *)column
- (NSString *)firstValue
{
- NSArray *columns = [_results allKeys];
- if (([columns count] > 0) && (_numberOfRows > 0)) {
- return [[_results objectForKey:[columns objectAtIndex:0]]objectAtIndex:0];
+ NSArray *columns = [results allKeys];
+ if (([columns count] > 0) && (numberOfRows > 0)) {
+ return [[results objectForKey:[columns objectAtIndex:0]]objectAtIndex:0];
}
return nil;
}
+- (NSError *)error
+{
+ return [error copy];
+}
+
- (void)writeToFile:(NSString *)path;
{
- [_results writeToFile:[path stringByExpandingTildeInPath] atomically:YES];
+ [results writeToFile:[path stringByExpandingTildeInPath] atomically:YES];
}
#pragma mark - Private Methods
@@ -312,7 +316,7 @@ - (id)_initWithDictionary:(NSDictionary *)theResults
userInfo:nil]raise];
if ((self = [self init])) {
- _results = theResults;
+ results = theResults;
[self _calculateNumberOfRows];
}
@@ -332,29 +336,36 @@ - (id)_initWithError:(NSError *)theError
userInfo:nil]raise];
if ((self = [self init])) {
- _error = theError;
+ error = theError;
[self _calculateNumberOfRows];
}
return self;
}
+- (void)_setError:(NSError *)theError
+{
+ if (error != theError) {
+ error = theError;
+ }
+}
+
- (void)_reset
{
- _numberOfRows = -1;
- _results = nil;
- _error = nil;
+ numberOfRows = -1;
+ results = nil;
+ error = nil;
}
- (void)_calculateNumberOfRows
{
// We cache the value once, for performance reasons
- if (-1 == _numberOfRows) {
- NSArray *allKeys = [_results allKeys];
+ if (-1 == numberOfRows) {
+ NSArray *allKeys = [results allKeys];
if ([allKeys count] == 0)
- _numberOfRows = 0;
+ numberOfRows = 0;
else
- _numberOfRows = [[_results objectForKey:[allKeys lastObject]]count];
+ numberOfRows = [[results objectForKey:[allKeys lastObject]]count];
}
}
/** \endcond */
View
169 vendor/Pods/NanoStore/Classes/Public/NSFNanoBag.m
@@ -35,13 +35,16 @@
@implementation NSFNanoBag
{
+@protected
/** \cond */
- NSMutableDictionary *_savedObjects;
- NSMutableDictionary *_unsavedObjects;
- NSMutableDictionary *_removedObjects;
+ NSMutableDictionary *savedObjects;
+ NSMutableDictionary *unsavedObjects;
+ NSMutableDictionary *removedObjects;
/** \endcond */
}
+@synthesize store, name, key, savedObjects, unsavedObjects, removedObjects, hasUnsavedChanges;
+
+ (NSFNanoBag*)bag
{
return [[self alloc]initBagWithName:nil andObjects:[NSArray array]];
@@ -73,8 +76,8 @@ - (id)initBagWithName:(NSString *)theName andObjects:(NSArray *)someObjects
if ((self = [self init])) {
[self addObjectsFromArray:someObjects error:nil];
- _name = theName;
- _hasUnsavedChanges = YES;
+ name = [theName copy];
+ hasUnsavedChanges = YES;
}
return self;
@@ -85,21 +88,21 @@ - (id)initBagWithName:(NSString *)theName andObjects:(NSArray *)someObjects
- (id)init
{
if ((self = [super init])) {
- _store = nil;
- _key = [NSFNanoEngine stringWithUUID];
- _name = nil;
- _savedObjects = [NSMutableDictionary new];
- _unsavedObjects = [NSMutableDictionary new];
- _removedObjects = [NSMutableDictionary new];
- _hasUnsavedChanges = NO;
+ store = nil;
+ key = [NSFNanoEngine stringWithUUID];
+ savedObjects = [NSMutableDictionary new];
+ unsavedObjects = [NSMutableDictionary new];
+ removedObjects = [NSMutableDictionary new];
+
+ hasUnsavedChanges = NO;
}
return self;
}
- (id)copyWithZone:(NSZone *)zone
{
- NSFNanoBag *copy = [[[self class]allocWithZone:zone]initNanoObjectFromDictionaryRepresentation:[self dictionaryRepresentation] forKey:[NSFNanoEngine stringWithUUID] store:_store];
+ NSFNanoBag *copy = [[[self class]allocWithZone:zone]initNanoObjectFromDictionaryRepresentation:[self dictionaryRepresentation] forKey:[NSFNanoEngine stringWithUUID] store:store];
return copy;
}
@@ -113,15 +116,20 @@ - (id)rootObject
- (void)setName:(NSString *)aName
{
- _name = aName;
- _hasUnsavedChanges = YES;
+ name = [aName copy];
+ hasUnsavedChanges = YES;
}
/** \endcond */
+- (NSString *)name
+{
+ return name;
+}
+
- (NSUInteger)count
{
- return _savedObjects.count + _unsavedObjects.count;
+ return savedObjects.count + unsavedObjects.count;
}
- (NSString *)description
@@ -134,13 +142,13 @@ - (NSDictionary *)dictionaryDescription
NSFOrderedDictionary *values = [NSFOrderedDictionary new];
values[@"NanoBag address"] = [NSString stringWithFormat:@"%p", self];
- values[@"Key"] = _key;
- values[@"Name"] = (nil != _name) ? _name : @"<untitled>";
- values[@"Document store"] = ([_store dictionaryDescription] ? [_store dictionaryDescription] : @"<nil>");
- values[@"Has unsaved changes?"] = (_hasUnsavedChanges ? @"YES" : @"NO");
- values[@"Saved objects"] = @([_savedObjects count]);
- values[@"Unsaved objects"] = @([_unsavedObjects count]);
- values[@"Removed objects"] = @([_removedObjects count]);
+ values[@"Key"] = key;
+ values[@"Name"] = (nil != name) ? name : @"<untitled>";
+ values[@"Document store"] = ([store dictionaryDescription] ? [store dictionaryDescription] : @"<nil>");
+ values[@"Has unsaved changes?"] = (hasUnsavedChanges ? @"YES" : @"NO");
+ values[@"Saved objects"] = @([savedObjects count]);
+ values[@"Unsaved objects"] = @([unsavedObjects count]);
+ values[@"Removed objects"] = @([removedObjects count]);
return values;
}
@@ -159,17 +167,17 @@ - (NSDictionary *)dictionaryRepresentation
{
// Iterate the objects collecting the object keys
NSMutableArray *objectKeys = [NSMutableArray new];
- for (NSString *objectKey in _savedObjects) {
+ for (NSString *objectKey in self.savedObjects) {
[objectKeys addObject:objectKey];
}
- for (NSString *objectKey in _unsavedObjects) {
+ for (NSString *objectKey in self.unsavedObjects) {
[objectKeys addObject:objectKey];
}
NSMutableDictionary *info = [NSMutableDictionary dictionary];
- if (nil != _name) {
- [info setObject:_name forKey:NSF_Private_NSFNanoBag_Name];
+ if (nil != name) {
+ [info setObject:name forKey:NSF_Private_NSFNanoBag_Name];
}
[info setObject:self.key forKey:NSF_Private_NSFNanoBag_NSFKey];
[info setObject:objectKeys forKey:NSF_Private_NSFNanoBag_NSFObjectKeys];
@@ -185,17 +193,17 @@ - (BOOL)isEqualToNanoBag:(NSFNanoBag *)otherNanoBag
BOOL success = YES;
- NSArray *sortedArraySelf = [[_savedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+ NSArray *sortedArraySelf = [[[self savedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
NSArray *sortedArrayOther = [[[otherNanoBag savedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
success = NO;
} else {
- sortedArraySelf = [[_unsavedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+ sortedArraySelf = [[[self unsavedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
sortedArrayOther = [[[otherNanoBag unsavedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
success = NO;
} else {
- sortedArraySelf = [[_removedObjects allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
+ sortedArraySelf = [[[self removedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
sortedArrayOther = [[[otherNanoBag removedObjects]allKeys]sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)];
if (NO == [sortedArraySelf isEqualToArray:sortedArrayOther]) {
success = NO;
@@ -220,10 +228,10 @@ - (BOOL)addObject:(id <NSFNanoObjectProtocol>)object error:(out NSError **)outEr
NSDictionary *info = [(id)object dictionaryRepresentation];
if (objectKey && info) {
- [_savedObjects removeObjectForKey:objectKey];
- [_unsavedObjects setObject:object forKey:objectKey];
- [_removedObjects removeObjectForKey:objectKey];
- _hasUnsavedChanges = YES;
+ [savedObjects removeObjectForKey:objectKey];
+ [unsavedObjects setObject:object forKey:objectKey];
+ [removedObjects removeObjectForKey:objectKey];
+ hasUnsavedChanges = YES;
} else {
NSString *message = nil;
if (nil == objectKey)
@@ -273,20 +281,21 @@ - (void)removeObject:(id <NSFNanoObjectProtocol>)object
- (void)removeAllObjects
{
- NSMutableDictionary *objects = [[NSMutableDictionary alloc]initWithCapacity:(_savedObjects.count + _removedObjects.count)];
+ NSMutableDictionary *objects = [[NSMutableDictionary alloc]initWithCapacity:(savedObjects.count + removedObjects.count